projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.3.4'
[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
6d9e3a0
..
ae7c9d2
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@
-18,7
+18,6
@@
package net.pterodactylus.sone.main;
import java.io.File;
package net.pterodactylus.sone.main;
import java.io.File;
-import java.util.Collections;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
@@
-33,7
+32,6
@@
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.config.MapConfigurationBackend;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.config.MapConfigurationBackend;
-import net.pterodactylus.util.config.XMLConfigurationBackend;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.logging.LoggingListener;
import net.pterodactylus.util.version.Version;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.logging.LoggingListener;
import net.pterodactylus.util.version.Version;
@@
-81,7
+79,7
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
}
/** The version. */
}
/** The version. */
- public static final Version VERSION = new Version(0, 3);
+ 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);
@@
-147,22
+145,28
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
- Configuration configuration;
- Configuration xmlConfiguration = null;
+ Configuration oldConfiguration;
+ Configuration newConfiguration = null;
+ boolean firstStart = !new File("sone.properties").exists();
+ boolean newConfig = false;
try {
try {
-
configuration = new Configuration(new XMLConfigurationBackend(new File("sone.xml
"), false));
-
xmlConfiguration = c
onfiguration;
+
oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties
"), false));
+
newConfiguration = oldC
onfiguration;
} catch (ConfigurationException ce1) {
} catch (ConfigurationException ce1) {
+ newConfig = true;
+ logger.log(Level.INFO, "Could not load configuration file, trying plugin store…", ce1);
try {
try {
- xmlConfiguration = new Configuration(new XMLConfigurationBackend(new File("sone.xml"), true));
+ newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
+ logger.log(Level.INFO, "Created new configuration file.");
} catch (ConfigurationException ce2) {
} catch (ConfigurationException ce2) {
- logger.log(Level.SEVERE, "Could not create
XML file, using Plugin Store!"
);
+ logger.log(Level.SEVERE, "Could not create
configuration file, using Plugin Store!", ce2
);
}
try {
}
try {
- configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+ oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+ logger.log(Level.INFO, "Plugin store loaded.");
} catch (DatabaseDisabledException dde1) {
} catch (DatabaseDisabledException dde1) {
- logger.log(Level.SEVERE, "Could not load any configuration, using
in-memor
y configuration!");
-
configuration = new Configuration(new MapConfigurationBackend(Collections.<String, String> emptyMap()
));
+ logger.log(Level.SEVERE, "Could not load any configuration, using
empt
y configuration!");
+
oldConfiguration = new Configuration(new MapConfigurationBackend(
));
}
}
}
}
@@
-176,7
+180,7
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
identityManager.setContext("Sone");
/* create core. */
identityManager.setContext("Sone");
/* create core. */
- core = new Core(
c
onfiguration, freenetInterface, identityManager);
+ core = new Core(
oldC
onfiguration, freenetInterface, identityManager);
/* create the web interface. */
webInterface = new WebInterface(this);
/* create the web interface. */
webInterface = new WebInterface(this);
@@
-189,10
+193,13
@@
public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
boolean startupFailed = true;
try {
core.start();
boolean startupFailed = true;
try {
core.start();
- if ((xmlConfiguration != null) && (configuration != xmlConfiguration)) {
- core.setConfiguration(xmlConfiguration);
+ if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+ logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+ core.setConfiguration(newConfiguration);
}
webInterface.start();
}
webInterface.start();
+ webInterface.setFirstStart(firstStart);
+ webInterface.setNewConfig(newConfig);
identityManager.start();
startupFailed = false;
} finally {
identityManager.start();
startupFailed = false;
} finally {