From 099a52bdea4f7fb4cfce4b68381499b8df044556 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 25 Mar 2020 17:48:36 +0100
Subject: [PATCH] Move non-command classes out of commands package
The commands package now only contains actual command classes. This
makes the non-command classes easier to find.
---
src/main/java/de/prob2/jupyter/{commands => }/Command.java | 2 +-
.../jupyter/{commands => }/CommandExecutionException.java | 4 +---
.../java/de/prob2/jupyter/{commands => }/CommandUtils.java | 3 +--
.../prob2/jupyter/{commands => }/NoSuchCommandException.java | 4 +---
src/main/java/de/prob2/jupyter/ProBKernel.java | 5 -----
.../jupyter/{commands => }/WithSourceCodeException.java | 2 +-
src/main/java/de/prob2/jupyter/commands/AssertCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/BrowseCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/BsymbCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/CheckCommand.java | 2 ++
.../java/de/prob2/jupyter/commands/ConstantsCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/DotCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/EvalCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/ExecCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/FindCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/GotoCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/GroovyCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/HelpCommand.java | 2 ++
.../java/de/prob2/jupyter/commands/InitialiseCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/LetCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java | 2 ++
.../java/de/prob2/jupyter/commands/ModelCheckCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/PrefCommand.java | 2 ++
.../java/de/prob2/jupyter/commands/PrettyPrintCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/RenderCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/ShowCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/SolveCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/StatsCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/TableCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/TimeCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/TraceCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/TypeCommand.java | 2 ++
src/main/java/de/prob2/jupyter/commands/UnletCommand.java | 1 +
src/main/java/de/prob2/jupyter/commands/VersionCommand.java | 1 +
35 files changed, 52 insertions(+), 15 deletions(-)
rename src/main/java/de/prob2/jupyter/{commands => }/Command.java (97%)
rename src/main/java/de/prob2/jupyter/{commands => }/CommandExecutionException.java (89%)
rename src/main/java/de/prob2/jupyter/{commands => }/CommandUtils.java (99%)
rename src/main/java/de/prob2/jupyter/{commands => }/NoSuchCommandException.java (93%)
rename src/main/java/de/prob2/jupyter/{commands => }/WithSourceCodeException.java (94%)
diff --git a/src/main/java/de/prob2/jupyter/commands/Command.java b/src/main/java/de/prob2/jupyter/Command.java
similarity index 97%
rename from src/main/java/de/prob2/jupyter/commands/Command.java
rename to src/main/java/de/prob2/jupyter/Command.java
index 3552677..ebeca7c 100644
--- a/src/main/java/de/prob2/jupyter/commands/Command.java
+++ b/src/main/java/de/prob2/jupyter/Command.java
@@ -1,4 +1,4 @@
-package de.prob2.jupyter.commands;
+package de.prob2.jupyter;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
import io.github.spencerpark.jupyter.kernel.display.DisplayData;
diff --git a/src/main/java/de/prob2/jupyter/commands/CommandExecutionException.java b/src/main/java/de/prob2/jupyter/CommandExecutionException.java
similarity index 89%
rename from src/main/java/de/prob2/jupyter/commands/CommandExecutionException.java
rename to src/main/java/de/prob2/jupyter/CommandExecutionException.java
index 0cb1e68..e423203 100644
--- a/src/main/java/de/prob2/jupyter/commands/CommandExecutionException.java
+++ b/src/main/java/de/prob2/jupyter/CommandExecutionException.java
@@ -1,6 +1,4 @@
-package de.prob2.jupyter.commands;
-
-import de.prob2.jupyter.UserErrorException;
+package de.prob2.jupyter;
import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/de/prob2/jupyter/commands/CommandUtils.java b/src/main/java/de/prob2/jupyter/CommandUtils.java
similarity index 99%
rename from src/main/java/de/prob2/jupyter/commands/CommandUtils.java
rename to src/main/java/de/prob2/jupyter/CommandUtils.java
index 954fb8c..e2b855a 100644
--- a/src/main/java/de/prob2/jupyter/commands/CommandUtils.java
+++ b/src/main/java/de/prob2/jupyter/CommandUtils.java
@@ -1,4 +1,4 @@
-package de.prob2.jupyter.commands;
+package de.prob2.jupyter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,7 +32,6 @@ import de.prob.animator.domainobjects.WDError;
import de.prob.exception.ProBError;
import de.prob.statespace.Trace;
import de.prob.unicode.UnicodeTranslator;
-import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
import io.github.spencerpark.jupyter.kernel.display.DisplayData;
diff --git a/src/main/java/de/prob2/jupyter/commands/NoSuchCommandException.java b/src/main/java/de/prob2/jupyter/NoSuchCommandException.java
similarity index 93%
rename from src/main/java/de/prob2/jupyter/commands/NoSuchCommandException.java
rename to src/main/java/de/prob2/jupyter/NoSuchCommandException.java
index f691665..5cd8199 100644
--- a/src/main/java/de/prob2/jupyter/commands/NoSuchCommandException.java
+++ b/src/main/java/de/prob2/jupyter/NoSuchCommandException.java
@@ -1,6 +1,4 @@
-package de.prob2.jupyter.commands;
-
-import de.prob2.jupyter.UserErrorException;
+package de.prob2.jupyter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/de/prob2/jupyter/ProBKernel.java b/src/main/java/de/prob2/jupyter/ProBKernel.java
index 6cbd573..eaed9c6 100644
--- a/src/main/java/de/prob2/jupyter/ProBKernel.java
+++ b/src/main/java/de/prob2/jupyter/ProBKernel.java
@@ -31,9 +31,6 @@ import de.prob2.jupyter.commands.AssertCommand;
import de.prob2.jupyter.commands.BrowseCommand;
import de.prob2.jupyter.commands.BsymbCommand;
import de.prob2.jupyter.commands.CheckCommand;
-import de.prob2.jupyter.commands.Command;
-import de.prob2.jupyter.commands.CommandExecutionException;
-import de.prob2.jupyter.commands.CommandUtils;
import de.prob2.jupyter.commands.ConstantsCommand;
import de.prob2.jupyter.commands.DotCommand;
import de.prob2.jupyter.commands.EvalCommand;
@@ -47,7 +44,6 @@ import de.prob2.jupyter.commands.LetCommand;
import de.prob2.jupyter.commands.LoadCellCommand;
import de.prob2.jupyter.commands.LoadFileCommand;
import de.prob2.jupyter.commands.ModelCheckCommand;
-import de.prob2.jupyter.commands.NoSuchCommandException;
import de.prob2.jupyter.commands.PrefCommand;
import de.prob2.jupyter.commands.PrettyPrintCommand;
import de.prob2.jupyter.commands.RenderCommand;
@@ -60,7 +56,6 @@ import de.prob2.jupyter.commands.TraceCommand;
import de.prob2.jupyter.commands.TypeCommand;
import de.prob2.jupyter.commands.UnletCommand;
import de.prob2.jupyter.commands.VersionCommand;
-import de.prob2.jupyter.commands.WithSourceCodeException;
import io.github.spencerpark.jupyter.kernel.BaseKernel;
import io.github.spencerpark.jupyter.kernel.LanguageInfo;
diff --git a/src/main/java/de/prob2/jupyter/commands/WithSourceCodeException.java b/src/main/java/de/prob2/jupyter/WithSourceCodeException.java
similarity index 94%
rename from src/main/java/de/prob2/jupyter/commands/WithSourceCodeException.java
rename to src/main/java/de/prob2/jupyter/WithSourceCodeException.java
index 71e4618..855c6ab 100644
--- a/src/main/java/de/prob2/jupyter/commands/WithSourceCodeException.java
+++ b/src/main/java/de/prob2/jupyter/WithSourceCodeException.java
@@ -1,4 +1,4 @@
-package de.prob2.jupyter.commands;
+package de.prob2.jupyter;
import de.prob.exception.ProBError;
diff --git a/src/main/java/de/prob2/jupyter/commands/AssertCommand.java b/src/main/java/de/prob2/jupyter/commands/AssertCommand.java
index 1268423..0d79d7a 100644
--- a/src/main/java/de/prob2/jupyter/commands/AssertCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/AssertCommand.java
@@ -7,6 +7,8 @@ import de.prob.animator.domainobjects.AbstractEvalResult;
import de.prob.animator.domainobjects.EvalResult;
import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java b/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java
index 852ea6f..6ec6593 100644
--- a/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java
@@ -12,6 +12,7 @@ import de.prob.statespace.LoadedMachine;
import de.prob.statespace.Trace;
import de.prob.statespace.Transition;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/BsymbCommand.java b/src/main/java/de/prob2/jupyter/commands/BsymbCommand.java
index d51a4f4..07bcee8 100644
--- a/src/main/java/de/prob2/jupyter/commands/BsymbCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/BsymbCommand.java
@@ -2,6 +2,8 @@ package de.prob2.jupyter.commands;
import com.google.inject.Inject;
+import de.prob2.jupyter.Command;
+
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
import io.github.spencerpark.jupyter.kernel.display.DisplayData;
diff --git a/src/main/java/de/prob2/jupyter/commands/CheckCommand.java b/src/main/java/de/prob2/jupyter/commands/CheckCommand.java
index 3897044..7f06044 100644
--- a/src/main/java/de/prob2/jupyter/commands/CheckCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/CheckCommand.java
@@ -20,6 +20,8 @@ import de.prob.model.representation.Invariant;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
import de.prob.unicode.UnicodeTranslator;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java b/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java
index c541c4e..264a3fe 100644
--- a/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java
@@ -10,6 +10,8 @@ import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
import de.prob.statespace.Transition;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/DotCommand.java b/src/main/java/de/prob2/jupyter/commands/DotCommand.java
index ec00c63..1e10001 100644
--- a/src/main/java/de/prob2/jupyter/commands/DotCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/DotCommand.java
@@ -19,6 +19,8 @@ import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.animator.domainobjects.IEvalElement;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/EvalCommand.java b/src/main/java/de/prob2/jupyter/commands/EvalCommand.java
index 38267a9..74c47cf 100644
--- a/src/main/java/de/prob2/jupyter/commands/EvalCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/EvalCommand.java
@@ -5,6 +5,8 @@ import com.google.inject.Injector;
import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/ExecCommand.java b/src/main/java/de/prob2/jupyter/commands/ExecCommand.java
index 43e607d..3135e01 100644
--- a/src/main/java/de/prob2/jupyter/commands/ExecCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/ExecCommand.java
@@ -11,6 +11,8 @@ import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
import de.prob.statespace.Transition;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/FindCommand.java b/src/main/java/de/prob2/jupyter/commands/FindCommand.java
index ebf0738..0664e95 100644
--- a/src/main/java/de/prob2/jupyter/commands/FindCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/FindCommand.java
@@ -7,6 +7,8 @@ import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.animator.domainobjects.IEvalElement;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/GotoCommand.java b/src/main/java/de/prob2/jupyter/commands/GotoCommand.java
index e02ec18..14c07f3 100644
--- a/src/main/java/de/prob2/jupyter/commands/GotoCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/GotoCommand.java
@@ -5,6 +5,7 @@ import com.google.inject.Inject;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java b/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java
index e8fc3e8..ad1e99d 100644
--- a/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java
@@ -10,6 +10,7 @@ import com.google.inject.Injector;
import de.prob.scripting.ScriptEngineProvider;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/HelpCommand.java b/src/main/java/de/prob2/jupyter/commands/HelpCommand.java
index 1ce3f6e..5203da1 100644
--- a/src/main/java/de/prob2/jupyter/commands/HelpCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/HelpCommand.java
@@ -12,6 +12,8 @@ import java.util.stream.Collectors;
import com.google.inject.Inject;
import com.google.inject.Injector;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java b/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java
index f67f808..1599a1d 100644
--- a/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java
@@ -10,6 +10,8 @@ import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
import de.prob.statespace.Transition;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/LetCommand.java b/src/main/java/de/prob2/jupyter/commands/LetCommand.java
index a8d5eb0..9233277 100644
--- a/src/main/java/de/prob2/jupyter/commands/LetCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/LetCommand.java
@@ -9,6 +9,8 @@ import de.prob.animator.domainobjects.AbstractEvalResult;
import de.prob.animator.domainobjects.EvalResult;
import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java b/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java
index 0056fbc..e08a3c0 100644
--- a/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java
@@ -10,6 +10,8 @@ import com.google.inject.Provider;
import de.prob.scripting.ClassicalBFactory;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java b/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java
index 1b4f2c4..5d14a5d 100644
--- a/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java
@@ -18,6 +18,8 @@ import de.prob.scripting.ModelFactory;
import de.prob.scripting.ModelTranslationError;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/ModelCheckCommand.java b/src/main/java/de/prob2/jupyter/commands/ModelCheckCommand.java
index e29022d..7356c6e 100644
--- a/src/main/java/de/prob2/jupyter/commands/ModelCheckCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/ModelCheckCommand.java
@@ -15,6 +15,7 @@ import de.prob.check.NotYetFinished;
import de.prob.check.StateSpaceStats;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.StateSpace;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/PrefCommand.java b/src/main/java/de/prob2/jupyter/commands/PrefCommand.java
index 3672b8b..2be8537 100644
--- a/src/main/java/de/prob2/jupyter/commands/PrefCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/PrefCommand.java
@@ -12,6 +12,8 @@ import de.prob.animator.command.GetPreferenceCommand;
import de.prob.animator.command.SetPreferenceCommand;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/PrettyPrintCommand.java b/src/main/java/de/prob2/jupyter/commands/PrettyPrintCommand.java
index 9df9783..fc0a2a2 100644
--- a/src/main/java/de/prob2/jupyter/commands/PrettyPrintCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/PrettyPrintCommand.java
@@ -6,6 +6,8 @@ import de.prob.animator.command.PrettyPrintFormulaCommand;
import de.prob.animator.domainobjects.FormulaExpand;
import de.prob.animator.domainobjects.IEvalElement;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
import io.github.spencerpark.jupyter.kernel.display.DisplayData;
diff --git a/src/main/java/de/prob2/jupyter/commands/RenderCommand.java b/src/main/java/de/prob2/jupyter/commands/RenderCommand.java
index 3b46ff3..51d77d6 100644
--- a/src/main/java/de/prob2/jupyter/commands/RenderCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/RenderCommand.java
@@ -2,6 +2,7 @@ package de.prob2.jupyter.commands;
import com.google.inject.Inject;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/ShowCommand.java b/src/main/java/de/prob2/jupyter/commands/ShowCommand.java
index 0c8a2e6..592ba37 100644
--- a/src/main/java/de/prob2/jupyter/commands/ShowCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/ShowCommand.java
@@ -15,6 +15,7 @@ import de.prob.animator.command.GetPreferenceCommand;
import de.prob.animator.domainobjects.AnimationMatrixEntry;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/SolveCommand.java b/src/main/java/de/prob2/jupyter/commands/SolveCommand.java
index 31f2d10..f89ee34 100644
--- a/src/main/java/de/prob2/jupyter/commands/SolveCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/SolveCommand.java
@@ -14,6 +14,8 @@ import de.prob.animator.domainobjects.IEvalElement;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/StatsCommand.java b/src/main/java/de/prob2/jupyter/commands/StatsCommand.java
index c26f7c1..212fd82 100644
--- a/src/main/java/de/prob2/jupyter/commands/StatsCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/StatsCommand.java
@@ -6,6 +6,7 @@ import de.prob.animator.command.ComputeStateSpaceStatsCommand;
import de.prob.check.StateSpaceStats;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/TableCommand.java b/src/main/java/de/prob2/jupyter/commands/TableCommand.java
index fca1b6f..9a4e3a8 100644
--- a/src/main/java/de/prob2/jupyter/commands/TableCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/TableCommand.java
@@ -16,6 +16,8 @@ import de.prob.animator.domainobjects.TableData;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
import de.prob.unicode.UnicodeTranslator;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/TimeCommand.java b/src/main/java/de/prob2/jupyter/commands/TimeCommand.java
index ee46d95..ac42663 100644
--- a/src/main/java/de/prob2/jupyter/commands/TimeCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/TimeCommand.java
@@ -7,6 +7,7 @@ import com.google.common.base.Stopwatch;
import com.google.inject.Inject;
import com.google.inject.Injector;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/TraceCommand.java b/src/main/java/de/prob2/jupyter/commands/TraceCommand.java
index c3f97bc..2cb417c 100644
--- a/src/main/java/de/prob2/jupyter/commands/TraceCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/TraceCommand.java
@@ -8,6 +8,7 @@ import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
import de.prob.statespace.Transition;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.UserErrorException;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/TypeCommand.java b/src/main/java/de/prob2/jupyter/commands/TypeCommand.java
index f103035..8c900cf 100644
--- a/src/main/java/de/prob2/jupyter/commands/TypeCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/TypeCommand.java
@@ -9,6 +9,8 @@ import de.prob.animator.domainobjects.TypeCheckResult;
import de.prob.exception.ProBError;
import de.prob.statespace.AnimationSelector;
import de.prob.statespace.Trace;
+import de.prob2.jupyter.Command;
+import de.prob2.jupyter.CommandUtils;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
diff --git a/src/main/java/de/prob2/jupyter/commands/UnletCommand.java b/src/main/java/de/prob2/jupyter/commands/UnletCommand.java
index 3c90e9f..b2f7f1e 100644
--- a/src/main/java/de/prob2/jupyter/commands/UnletCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/UnletCommand.java
@@ -5,6 +5,7 @@ import java.util.Map;
import com.google.inject.Inject;
import com.google.inject.Injector;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.ProBKernel;
import de.prob2.jupyter.UserErrorException;
diff --git a/src/main/java/de/prob2/jupyter/commands/VersionCommand.java b/src/main/java/de/prob2/jupyter/commands/VersionCommand.java
index b68b59b..c22c7f0 100644
--- a/src/main/java/de/prob2/jupyter/commands/VersionCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/VersionCommand.java
@@ -5,6 +5,7 @@ import com.google.inject.Inject;
import de.prob.Main;
import de.prob.animator.command.GetVersionCommand;
import de.prob.statespace.AnimationSelector;
+import de.prob2.jupyter.Command;
import de.prob2.jupyter.ProBKernel;
import io.github.spencerpark.jupyter.kernel.ReplacementOptions;
--
GitLab