projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🎨 Replace Plugin containers with Kotlin versions
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
PreferencesLoader.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/PreferencesLoader.java
b/src/main/java/net/pterodactylus/sone/core/PreferencesLoader.java
index
6cc2e5e
..
a730983
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/PreferencesLoader.java
+++ b/
src/main/java/net/pterodactylus/sone/core/PreferencesLoader.java
@@
-7,8
+7,6
@@
import net.pterodactylus.util.config.ConfigurationException;
/**
* Loads preferences stored in a {@link Configuration} into a {@link
* Preferences} object.
/**
* Loads preferences stored in a {@link Configuration} into a {@link
* Preferences} object.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class PreferencesLoader {
*/
public class PreferencesLoader {
@@
-33,67
+31,71
@@
public class PreferencesLoader {
}
private void loadInsertionDelay(Configuration configuration) {
}
private void loadInsertionDelay(Configuration configuration) {
- preferences.setInsertionDelay(configuration.getIntValue(
+ preferences.set
New
InsertionDelay(configuration.getIntValue(
"Option/InsertionDelay").getValue(null));
}
private void loadPostsPerPage(Configuration configuration) {
"Option/InsertionDelay").getValue(null));
}
private void loadPostsPerPage(Configuration configuration) {
- preferences.setPostsPerPage(
+ preferences.set
New
PostsPerPage(
configuration.getIntValue("Option/PostsPerPage")
.getValue(null));
}
private void loadImagesPerPage(Configuration configuration) {
configuration.getIntValue("Option/PostsPerPage")
.getValue(null));
}
private void loadImagesPerPage(Configuration configuration) {
- preferences.setImagesPerPage(
+ preferences.set
New
ImagesPerPage(
configuration.getIntValue("Option/ImagesPerPage")
.getValue(null));
}
private void loadCharactersPerPost(Configuration configuration) {
configuration.getIntValue("Option/ImagesPerPage")
.getValue(null));
}
private void loadCharactersPerPost(Configuration configuration) {
- preferences.setCharactersPerPost(
+ preferences.set
New
CharactersPerPost(
configuration.getIntValue("Option/CharactersPerPost")
.getValue(null));
}
private void loadPostCutOffLength(Configuration configuration) {
configuration.getIntValue("Option/CharactersPerPost")
.getValue(null));
}
private void loadPostCutOffLength(Configuration configuration) {
- preferences.setPostCutOffLength(
- configuration.getIntValue("Option/PostCutOffLength")
- .getValue(null));
+ try {
+ preferences.setNewPostCutOffLength(
+ configuration.getIntValue("Option/PostCutOffLength")
+ .getValue(null));
+ } catch (IllegalArgumentException iae1) {
+ /* previous versions allowed -1, ignore and use default. */
+ }
}
private void loadRequireFullAccess(Configuration configuration) {
}
private void loadRequireFullAccess(Configuration configuration) {
- preferences.setRequireFullAccess(
+ preferences.set
New
RequireFullAccess(
configuration.getBooleanValue("Option/RequireFullAccess")
.getValue(null));
}
private void loadPositiveTrust(Configuration configuration) {
configuration.getBooleanValue("Option/RequireFullAccess")
.getValue(null));
}
private void loadPositiveTrust(Configuration configuration) {
- preferences.setPositiveTrust(
+ preferences.set
New
PositiveTrust(
configuration.getIntValue("Option/PositiveTrust")
.getValue(null));
}
private void loadNegativeTrust(Configuration configuration) {
configuration.getIntValue("Option/PositiveTrust")
.getValue(null));
}
private void loadNegativeTrust(Configuration configuration) {
- preferences.setNegativeTrust(
+ preferences.setNe
wNe
gativeTrust(
configuration.getIntValue("Option/NegativeTrust")
.getValue(null));
}
private void loadTrustComment(Configuration configuration) {
configuration.getIntValue("Option/NegativeTrust")
.getValue(null));
}
private void loadTrustComment(Configuration configuration) {
- preferences.setTrustComment(
+ preferences.set
New
TrustComment(
configuration.getStringValue("Option/TrustComment")
.getValue(null));
}
private void loadFcpInterfaceActive(Configuration configuration) {
configuration.getStringValue("Option/TrustComment")
.getValue(null));
}
private void loadFcpInterfaceActive(Configuration configuration) {
- preferences.setFcpInterfaceActive(configuration.getBooleanValue(
+ preferences.set
New
FcpInterfaceActive(configuration.getBooleanValue(
"Option/ActivateFcpInterface").getValue(null));
}
private void loadFcpFullAccessRequired(Configuration configuration) {
Integer fullAccessRequiredInteger = configuration
.getIntValue("Option/FcpFullAccessRequired").getValue(null);
"Option/ActivateFcpInterface").getValue(null));
}
private void loadFcpFullAccessRequired(Configuration configuration) {
Integer fullAccessRequiredInteger = configuration
.getIntValue("Option/FcpFullAccessRequired").getValue(null);
- preferences.setFcpFullAccessRequired(
+ preferences.set
New
FcpFullAccessRequired(
(fullAccessRequiredInteger == null) ? null :
FullAccessRequired.values()[fullAccessRequiredInteger]);
}
(fullAccessRequiredInteger == null) ? null :
FullAccessRequired.values()[fullAccessRequiredInteger]);
}