X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FPreferencesLoader.java;h=5fa33e4ccebb31a9995ee2217b458bdfa2b71b72;hb=72e43af1e442398e304167c1e18e229d254fba7b;hp=0ae13ba19949e577681c35ccb1b5e6720a0e85fa;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/PreferencesLoader.java b/src/main/java/net/pterodactylus/sone/core/PreferencesLoader.java
index 0ae13ba..5fa33e4 100644
--- 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.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class PreferencesLoader {
 
@@ -25,39 +23,36 @@ public class PreferencesLoader {
 		loadCharactersPerPost(configuration);
 		loadPostCutOffLength(configuration);
 		loadRequireFullAccess(configuration);
-		loadPositiveTrust(configuration);
-		loadNegativeTrust(configuration);
-		loadTrustComment(configuration);
 		loadFcpInterfaceActive(configuration);
 		loadFcpFullAccessRequired(configuration);
 	}
 
 	private void loadInsertionDelay(Configuration configuration) {
-		preferences.setInsertionDelay(configuration.getIntValue(
+		preferences.setNewInsertionDelay(configuration.getIntValue(
 				"Option/InsertionDelay").getValue(null));
 	}
 
 	private void loadPostsPerPage(Configuration configuration) {
-		preferences.setPostsPerPage(
+		preferences.setNewPostsPerPage(
 				configuration.getIntValue("Option/PostsPerPage")
 						.getValue(null));
 	}
 
 	private void loadImagesPerPage(Configuration configuration) {
-		preferences.setImagesPerPage(
+		preferences.setNewImagesPerPage(
 				configuration.getIntValue("Option/ImagesPerPage")
 						.getValue(null));
 	}
 
 	private void loadCharactersPerPost(Configuration configuration) {
-		preferences.setCharactersPerPost(
+		preferences.setNewCharactersPerPost(
 				configuration.getIntValue("Option/CharactersPerPost")
 						.getValue(null));
 	}
 
 	private void loadPostCutOffLength(Configuration configuration) {
 		try {
-			preferences.setPostCutOffLength(
+			preferences.setNewPostCutOffLength(
 					configuration.getIntValue("Option/PostCutOffLength")
 							.getValue(null));
 		} catch (IllegalArgumentException iae1) {
@@ -66,38 +61,20 @@ public class PreferencesLoader {
 	}
 
 	private void loadRequireFullAccess(Configuration configuration) {
-		preferences.setRequireFullAccess(
+		preferences.setNewRequireFullAccess(
 				configuration.getBooleanValue("Option/RequireFullAccess")
 						.getValue(null));
 	}
 
-	private void loadPositiveTrust(Configuration configuration) {
-		preferences.setPositiveTrust(
-				configuration.getIntValue("Option/PositiveTrust")
-						.getValue(null));
-	}
-
-	private void loadNegativeTrust(Configuration configuration) {
-		preferences.setNegativeTrust(
-				configuration.getIntValue("Option/NegativeTrust")
-						.getValue(null));
-	}
-
-	private void loadTrustComment(Configuration configuration) {
-		preferences.setTrustComment(
-				configuration.getStringValue("Option/TrustComment")
-						.getValue(null));
-	}
-
 	private void loadFcpInterfaceActive(Configuration configuration) {
-		preferences.setFcpInterfaceActive(configuration.getBooleanValue(
+		preferences.setNewFcpInterfaceActive(configuration.getBooleanValue(
 				"Option/ActivateFcpInterface").getValue(null));
 	}
 
 	private void loadFcpFullAccessRequired(Configuration configuration) {
 		Integer fullAccessRequiredInteger = configuration
 				.getIntValue("Option/FcpFullAccessRequired").getValue(null);
-		preferences.setFcpFullAccessRequired(
+		preferences.setNewFcpFullAccessRequired(
 				(fullAccessRequiredInteger == null) ? null :
 						FullAccessRequired.values()[fullAccessRequiredInteger]);
 	}