Refactor preference parsing into a common utility method

notebooks/tests/pref.ipynb

@@ -313,10 +313,10 @@
    "outputs": [
     {
      "ename": "CommandExecutionException",
-     "evalue": ":pref: Cannot view and change preferences in the same command (missing value for preference \"MAXINT\")",
+     "evalue": ":pref: Missing value for preference MAXINT",
      "output_type": "error",
      "traceback": [
-      "\u001b[1m\u001b[31m:pref: Cannot view and change preferences in the same command (missing value for preference \"MAXINT\")\u001b[0m"
+      "\u001b[1m\u001b[31m:pref: Missing value for preference MAXINT\u001b[0m"
      ]
     }
    ],

src/main/java/de/prob2/jupyter/commands/CommandUtils.java

@@ -2,7 +2,9 @@ package de.prob2.jupyter.commands;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -15,4 +17,16 @@ public final class CommandUtils {
 			return Arrays.asList(split);
 		}
 	}
+	
+	public static @NotNull Map<@NotNull String, @NotNull String> parsePreferences(final @NotNull String name, final @NotNull List<@NotNull String> args) {
+		final Map<String, String> preferences = new HashMap<>();
+		for (final String arg : args) {
+			final String[] split = arg.split("=", 2);
+			if (split.length == 1) {
+				throw new CommandExecutionException(name, "Missing value for preference " + split[0]);
+			}
+			preferences.put(split[0], split[1]);
+		}
+		return preferences;
+	}
 }

src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java

 package de.prob2.jupyter.commands;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -38,14 +37,7 @@ public final class LoadCellCommand implements CellCommand {
 	@Override
 	public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString, final @NotNull String body) {
 		final List<String> args = CommandUtils.splitArgs(argString);
-		final Map<String, String> preferences = new HashMap<>();
-		for (final String arg : args) {
-			final String[] split = arg.split("=", 2);
-			if (split.length == 1) {
-				throw new CommandExecutionException(name, "Missing value for preference " + split[0]);
-			}
-			preferences.put(split[0], split[1]);
-		}
+		final Map<String, String> preferences = CommandUtils.parsePreferences(name, args);
 		
 		kernel.setTrace(new Trace(this.classicalBFactory.create(body).load(preferences)));
 		return new DisplayData("Loaded machine: " + kernel.getTrace().getModel());

src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java

 package de.prob2.jupyter.commands;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,15 +44,7 @@ public final class LoadFileCommand implements LineCommand {
 		}
 		
 		final String fileName = args.get(0);
-		final List<String> prefArgs = args.subList(1, args.size());
-		final Map<String, String> preferences = new HashMap<>();
-		for (final String arg : prefArgs) {
-			final String[] split = arg.split("=", 2);
-			if (split.length == 1) {
-				throw new CommandExecutionException(name, "Missing value for preference " + split[0]);
-			}
-			preferences.put(split[0], split[1]);
-		}
+		final Map<String, String> preferences = CommandUtils.parsePreferences(name, args.subList(1, args.size()));
 		
 		try {
 			kernel.setTrace(new Trace(this.classicalBFactory.extract(fileName).load(preferences)));

src/main/java/de/prob2/jupyter/commands/PrefCommand.java

@@ -49,21 +49,14 @@ public final class PrefCommand implements LineCommand {
 			});
 		} else if (args.get(0).contains("=")) {
 			final List<SetPreferenceCommand> cmds = new ArrayList<>();
-			for (final String arg : args) {
-				final String[] split = arg.split("=", 2);
-				if (split.length == 1) {
-					throw new CommandExecutionException(name, String.format("Cannot view and change preferences in the same command (missing value for preference %s)", split[0]));
-				}
-				assert split.length == 2;
-				final String pref = split[0];
-				final String value = split[1];
+			CommandUtils.parsePreferences(name, args).forEach((pref, value) -> {
 				cmds.add(new SetPreferenceCommand(pref, value));
 				sb.append("Preference changed: ");
 				sb.append(pref);
 				sb.append(" = ");
 				sb.append(value);
 				sb.append('\n');
-			}
+			});
 			kernel.getTrace().getStateSpace().execute(new ComposedCommand(cmds));
 		} else {
 			final List<GetPreferenceCommand> cmds = new ArrayList<>();