Skip to content
Snippets Groups Projects
Commit d1901e09 authored by dgelessus's avatar dgelessus
Browse files

Remove the no longer needed name argument of the command run methods

Previously it was used to add the command name to error messages, but
this is now done automatically by ProBKernel, and no longer requires
any special code in the commands themselves.
parent a2d34d8c
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 17 deletions
......@@ -104,7 +104,7 @@ public final class ProBKernel extends BaseKernel {
throw new NoSuchCommandException(name);
}
try {
return command.run(this, name, argString, body);
return command.run(this, argString, body);
} catch (final UserErrorException e) {
throw new CommandExecutionException(name, e);
}
......@@ -116,7 +116,7 @@ public final class ProBKernel extends BaseKernel {
throw new NoSuchCommandException(name);
}
try {
return command.run(this, name, argString);
return command.run(this, argString);
} catch (final UserErrorException e) {
throw new CommandExecutionException(name, e);
}
......
......@@ -56,7 +56,7 @@ public final class BrowseCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
if (!argString.isEmpty()) {
throw new UserErrorException("Unexpected argument: " + argString);
}
......
......@@ -7,5 +7,5 @@ import io.github.spencerpark.jupyter.messages.DisplayData;
import org.jetbrains.annotations.NotNull;
public interface CellCommand extends BaseCommand {
public abstract @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString, final @NotNull String body);
public abstract @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString, final @NotNull String body);
}
......@@ -20,7 +20,7 @@ public final class CommandUtils {
}
}
public static @NotNull Map<@NotNull String, @NotNull String> parsePreferences(final @NotNull String name, final @NotNull List<@NotNull String> args) {
public static @NotNull Map<@NotNull String, @NotNull String> parsePreferences(final @NotNull List<@NotNull String> args) {
final Map<String, String> preferences = new HashMap<>();
for (final String arg : args) {
final String[] split = arg.split("=", 2);
......
......@@ -37,7 +37,7 @@ public final class ConstantsCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
final Trace trace = this.animationSelector.getCurrentTrace();
final List<String> predicates = argString.isEmpty() ? Collections.emptyList() : Collections.singletonList(argString);
final Transition op = trace.getCurrentState().findTransition("$setup_constants", predicates);
......
......@@ -39,7 +39,7 @@ public final class ExecCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
final String[] split = argString.split("\\h", 2);
assert split.length >= 1;
final String opNameOrId = split[0];
......
......@@ -36,7 +36,7 @@ public final class GroovyCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
this.groovyScriptEngine.put("__console", System.out);
final Object result;
try {
......
......@@ -30,7 +30,7 @@ public final class HelpCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
final List<String> args = CommandUtils.splitArgs(argString);
if (args.isEmpty()) {
final StringBuilder sb = new StringBuilder("Type a valid B expression, or one of the following commands:\n");
......
......@@ -37,7 +37,7 @@ public final class InitialiseCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
final Trace trace = this.animationSelector.getCurrentTrace();
final List<String> predicates = argString.isEmpty() ? Collections.emptyList() : Collections.singletonList(argString);
final Transition op = trace.getCurrentState().findTransition("$initialise_machine", predicates);
......
......@@ -7,5 +7,5 @@ import io.github.spencerpark.jupyter.messages.DisplayData;
import org.jetbrains.annotations.NotNull;
public interface LineCommand extends BaseCommand {
public abstract @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString);
public abstract @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString);
}
......@@ -38,9 +38,9 @@ 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) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString, final @NotNull String body) {
final List<String> args = CommandUtils.splitArgs(argString);
final Map<String, String> preferences = CommandUtils.parsePreferences(name, args);
final Map<String, String> preferences = CommandUtils.parsePreferences(args);
this.animationSelector.changeCurrentAnimation(new Trace(this.classicalBFactory.create(body).load(preferences)));
return new DisplayData("Loaded machine: " + this.animationSelector.getCurrentTrace().getModel());
......
......@@ -41,14 +41,14 @@ public final class LoadFileCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
final List<String> args = CommandUtils.splitArgs(argString);
if (args.isEmpty()) {
throw new UserErrorException("Missing machine file name");
}
final String fileName = args.get(0);
final Map<String, String> preferences = CommandUtils.parsePreferences(name, args.subList(1, args.size()));
final Map<String, String> preferences = CommandUtils.parsePreferences(args.subList(1, args.size()));
try {
this.animationSelector.changeCurrentAnimation(new Trace(this.classicalBFactory.extract(fileName).load(preferences)));
......
......@@ -40,7 +40,7 @@ public final class PrefCommand implements LineCommand {
}
@Override
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String name, final @NotNull String argString) {
public @NotNull DisplayData run(final @NotNull ProBKernel kernel, final @NotNull String argString) {
final List<String> args = CommandUtils.splitArgs(argString);
final StringBuilder sb = new StringBuilder();
if (args.isEmpty()) {
......@@ -55,7 +55,7 @@ public final class PrefCommand implements LineCommand {
});
} else if (args.get(0).contains("=")) {
final List<SetPreferenceCommand> cmds = new ArrayList<>();
CommandUtils.parsePreferences(name, args).forEach((pref, value) -> {
CommandUtils.parsePreferences(args).forEach((pref, value) -> {
cmds.add(new SetPreferenceCommand(pref, value));
sb.append("Preference changed: ");
sb.append(pref);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment