X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=748dff76b8b6f2b1276289fe84f6b00cb3d7ea13;hb=bdc36fce008474fbb910dd599ce64d88fbc60461;hp=0c2dbcfc6f4b88553df06ff385dbb8009ccb39e2;hpb=3ff1cdf09693a28719246a9a98a8b908e8c848f7;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 0c2dbcf..748dff7 100644
--- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@ -17,10 +17,11 @@
 
 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;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * This page lets the user edit the options of the Sone plugin.
@@ -49,31 +50,37 @@ public class OptionsPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
-		Options options = webInterface.getCore().getOptions();
+	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
+		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", 3));
+			preferences.setNegativeTrust(negativeTrust);
+			String trustComment = request.getHttpRequest().getPartAsStringFailsafe("trust-comment", 256);
+			if (trustComment.trim().length() == 0) {
+				trustComment = null;
+			}
+			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());
 		}
-		template.set("insertion-delay", options.getIntegerOption("InsertionDelay").get());
-		template.set("positive-trust", options.getIntegerOption("PositiveTrust").get());
-		template.set("negative-trust", options.getIntegerOption("NegativeTrust").get());
-		template.set("sone-rescue-mode", options.getBooleanOption("SoneRescueMode").get());
-		template.set("clear-on-next-restart", options.getBooleanOption("ClearOnNextRestart").get());
-		template.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());
 	}
 
 }