projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into new-database-38
[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
b35c556
..
42e2fe1
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - SonePlugin.java - Copyright © 2010 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010
–2012
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-24,6
+24,9
@@
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.core.FreenetInterface;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.core.FreenetInterface;
+import net.pterodactylus.sone.core.WebOfTrustUpdater;
+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.plugin.PluginConnector;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
import net.pterodactylus.sone.freenet.plugin.PluginConnector;
@@
-68,22
+71,22
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
Class<?> loggerClass = Logging.getLoggerClass(logRecord.getLoggerName());
int recordLevel = logRecord.getLevel().intValue();
if (recordLevel < Level.FINE.intValue()) {
Class<?> loggerClass = Logging.getLoggerClass(logRecord.getLoggerName());
int recordLevel = logRecord.getLevel().intValue();
if (recordLevel < Level.FINE.intValue()) {
- freenet.support.Logger.debug(loggerClass,
String.format(logRecord.getMessage(), logRecord.getParameters()
), logRecord.getThrown());
+ freenet.support.Logger.debug(loggerClass,
logRecord.getMessage(
), logRecord.getThrown());
} else if (recordLevel < Level.INFO.intValue()) {
} else if (recordLevel < Level.INFO.intValue()) {
- freenet.support.Logger.minor(loggerClass,
String.format(logRecord.getMessage(), logRecord.getParameters()
), logRecord.getThrown());
+ freenet.support.Logger.minor(loggerClass,
logRecord.getMessage(
), logRecord.getThrown());
} else if (recordLevel < Level.WARNING.intValue()) {
} else if (recordLevel < Level.WARNING.intValue()) {
- freenet.support.Logger.normal(loggerClass,
String.format(logRecord.getMessage(), logRecord.getParameters()
), logRecord.getThrown());
+ freenet.support.Logger.normal(loggerClass,
logRecord.getMessage(
), logRecord.getThrown());
} else if (recordLevel < Level.SEVERE.intValue()) {
} else if (recordLevel < Level.SEVERE.intValue()) {
- freenet.support.Logger.warning(loggerClass,
String.format(logRecord.getMessage(), logRecord.getParameters()
), logRecord.getThrown());
+ freenet.support.Logger.warning(loggerClass,
logRecord.getMessage(
), logRecord.getThrown());
} else {
} else {
- freenet.support.Logger.error(loggerClass,
String.format(logRecord.getMessage(), logRecord.getParameters()
), logRecord.getThrown());
+ freenet.support.Logger.error(loggerClass,
logRecord.getMessage(
), logRecord.getThrown());
}
}
});
}
/** The version. */
}
}
});
}
/** The version. */
- public static final Version VERSION = new Version(0,
7, 3
);
+ public static final Version VERSION = new Version(0,
8, 2
);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@
-188,8
+191,15
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
identityManager = new IdentityManager(webOfTrustConnector);
identityManager.setContext("Sone");
identityManager = new IdentityManager(webOfTrustConnector);
identityManager.setContext("Sone");
+ /* create Sone database. */
+ Database soneDatabase = new MemoryDatabase();
+
+ /* create trust updater. */
+ WebOfTrustUpdater trustUpdater = new WebOfTrustUpdater(webOfTrustConnector);
+ trustUpdater.init();
+
/* create core. */
/* create core. */
- core = new Core(oldConfiguration,
freenetInterface, identityManag
er);
+ core = new Core(oldConfiguration,
soneDatabase, freenetInterface, identityManager, trustUpdat
er);
/* create the web interface. */
webInterface = new WebInterface(this);
/* create the web interface. */
webInterface = new WebInterface(this);