X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=84d7c799930a834803f41cf6a46fb36c0337e8a5;hb=0e04143f3b957248ebd4e263372ebed4ae39928d;hp=421b2a2f75cb7b80a31eef36355f8ade29024a54;hpb=13e00a0611cd80e43f813171d8b6d84870afbcbc;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
index 421b2a2..84d7c79 100644
--- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
-import net.pterodactylus.sone.core.Options;
+import net.pterodactylus.sone.core.Core.Preferences;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
@@ -52,35 +52,35 @@ public class OptionsPage extends SoneTemplatePage {
 	@Override
 	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
-		Options options = webInterface.getCore().getOptions();
+		Preferences preferences = webInterface.getCore().getPreferences();
 		if (request.getMethod() == Method.POST) {
 			Integer insertionDelay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("insertion-delay", 16));
-			options.getIntegerOption("InsertionDelay").set(insertionDelay);
-			Integer positiveTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("positive-trust", 3), options.getIntegerOption("PositiveTrust").getReal());
-			options.getIntegerOption("PositiveTrust").set(positiveTrust);
-			Integer negativeTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("negative-trust", 3), options.getIntegerOption("NegativeTrust").getReal());
-			options.getIntegerOption("NegativeTrust").set(negativeTrust);
+			preferences.setInsertionDelay(insertionDelay);
+			Integer positiveTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("positive-trust", 3));
+			preferences.setPositiveTrust(positiveTrust);
+			Integer negativeTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("negative-trust", 4));
+			preferences.setNegativeTrust(negativeTrust);
 			String trustComment = request.getHttpRequest().getPartAsStringFailsafe("trust-comment", 256);
 			if (trustComment.trim().length() == 0) {
 				trustComment = null;
 			}
-			options.getStringOption("TrustComment").set(trustComment);
+			preferences.setTrustComment(trustComment);
 			boolean soneRescueMode = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("sone-rescue-mode", 5));
-			options.getBooleanOption("SoneRescueMode").set(soneRescueMode);
+			preferences.setSoneRescueMode(soneRescueMode);
 			boolean clearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("clear-on-next-restart", 5));
-			options.getBooleanOption("ClearOnNextRestart").set(clearOnNextRestart);
+			preferences.setClearOnNextRestart(clearOnNextRestart);
 			boolean reallyClearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("really-clear-on-next-restart", 5));
-			options.getBooleanOption("ReallyClearOnNextRestart").set(reallyClearOnNextRestart);
+			preferences.setReallyClearOnNextRestart(reallyClearOnNextRestart);
 			webInterface.getCore().saveConfiguration();
 			throw new RedirectException(getPath());
 		}
-		templateContext.set("insertion-delay", options.getIntegerOption("InsertionDelay").get());
-		templateContext.set("positive-trust", options.getIntegerOption("PositiveTrust").get());
-		templateContext.set("negative-trust", options.getIntegerOption("NegativeTrust").get());
-		templateContext.set("trust-comment", options.getStringOption("TrustComment").get());
-		templateContext.set("sone-rescue-mode", options.getBooleanOption("SoneRescueMode").get());
-		templateContext.set("clear-on-next-restart", options.getBooleanOption("ClearOnNextRestart").get());
-		templateContext.set("really-clear-on-next-restart", options.getBooleanOption("ReallyClearOnNextRestart").get());
+		templateContext.set("insertion-delay", preferences.getInsertionDelay());
+		templateContext.set("positive-trust", preferences.getPositiveTrust());
+		templateContext.set("negative-trust", preferences.getNegativeTrust());
+		templateContext.set("trust-comment", preferences.getTrustComment());
+		templateContext.set("sone-rescue-mode", preferences.isSoneRescueMode());
+		templateContext.set("clear-on-next-restart", preferences.isClearOnNextRestart());
+		templateContext.set("really-clear-on-next-restart", preferences.isReallyClearOnNextRestart());
 	}
 
 }