projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There is no plugin store to persist anymore.
[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
ff14193
..
1f2622c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@
-44,7
+44,6
@@
import freenet.pluginmanager.FredPluginL10n;
import freenet.pluginmanager.FredPluginThreadless;
import freenet.pluginmanager.FredPluginVersioned;
import freenet.pluginmanager.PluginRespirator;
import freenet.pluginmanager.FredPluginThreadless;
import freenet.pluginmanager.FredPluginVersioned;
import freenet.pluginmanager.PluginRespirator;
-import freenet.pluginmanager.PluginStore;
/**
* This class interfaces with Freenet. It is the class that is loaded by the
/**
* This class interfaces with Freenet. It is the class that is loaded by the
@@
-79,7
+78,7
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
}
/** The version. */
}
/** The version. */
- public static final Version VERSION = new Version(
"RC3", 0, 3, 1
);
+ public static final Version VERSION = new Version(
0, 3, 4
);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@
-96,9
+95,6
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/** The l10n helper. */
private PluginL10n l10n;
/** The l10n helper. */
private PluginL10n l10n;
- /** The plugin store. */
- private PluginStore pluginStore;
-
/** The identity manager. */
private IdentityManager identityManager;
/** The identity manager. */
private IdentityManager identityManager;
@@
-147,16
+143,19
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/* create a configuration. */
Configuration oldConfiguration;
Configuration newConfiguration = null;
/* create a configuration. */
Configuration oldConfiguration;
Configuration newConfiguration = null;
+ boolean firstStart = !new File("sone.properties").exists();
+ boolean newConfig = false;
try {
oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
newConfiguration = oldConfiguration;
} catch (ConfigurationException ce1) {
try {
oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
newConfiguration = oldConfiguration;
} catch (ConfigurationException ce1) {
- logger.log(Level.INFO, "Could not load configuration file, trying plugin store…");
+ newConfig = true;
+ logger.log(Level.INFO, "Could not load configuration file, trying plugin store…", ce1);
try {
newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
logger.log(Level.INFO, "Created new configuration file.");
} catch (ConfigurationException ce2) {
try {
newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
logger.log(Level.INFO, "Created new configuration file.");
} catch (ConfigurationException ce2) {
- logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!");
+ logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!"
, ce2
);
}
try {
oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
}
try {
oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
@@
-195,6
+194,8
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
core.setConfiguration(newConfiguration);
}
webInterface.start();
core.setConfiguration(newConfiguration);
}
webInterface.start();
+ webInterface.setFirstStart(firstStart);
+ webInterface.setNewConfig(newConfig);
identityManager.start();
startupFailed = false;
} finally {
identityManager.start();
startupFailed = false;
} finally {
@@
-223,14
+224,6
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/* stop the identity manager. */
identityManager.stop();
/* stop the identity manager. */
identityManager.stop();
-
- /* TODO wait for core to stop? */
- try {
- pluginRespirator.putStore(pluginStore);
- } catch (DatabaseDisabledException dde1) {
- logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
- }
-
} finally {
/* shutdown logger. */
Logging.shutdown();
} finally {
/* shutdown logger. */
Logging.shutdown();