diff --git a/build.gradle b/build.gradle index 4e49082eca8c118db1a5637e496bedbd15044c3a..54b7b49ae9bfa8de672167044e5c041aa08dfb71 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ configurations.all { dependencies { compile(group: "de.hhu.stups", name: "de.prob2.kernel", version: "3.2.10-SNAPSHOT", changing: true) - compile(group: "io.github.spencerpark", name: "jupyter-jvm-basekernel", version: "2.0.0-SNAPSHOT", changing: true) + compile(group: "io.github.spencerpark", name: "jupyter-jvm-basekernel", version: "2.1.1-SNAPSHOT", changing: true) compile(group: "org.jetbrains", name: "annotations", version: "16.0.1") compile(group: "se.sawano.java", name: "alphanumeric-comparator", version: "1.4.1") } diff --git a/src/main/java/de/prob2/jupyter/ProBKernel.java b/src/main/java/de/prob2/jupyter/ProBKernel.java index 77679165b6fa2d382aeb39e56cfb564c5384cdbb..b18eb8bd72bea458f9e9ca44502695242ed1e0af 100644 --- a/src/main/java/de/prob2/jupyter/ProBKernel.java +++ b/src/main/java/de/prob2/jupyter/ProBKernel.java @@ -33,7 +33,7 @@ import de.prob2.jupyter.commands.VersionCommand; import io.github.spencerpark.jupyter.kernel.BaseKernel; import io.github.spencerpark.jupyter.kernel.LanguageInfo; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java b/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java index 8b68835e0ea3d5a354dda7a9266efeba7c1de204..64756f256bf2d98cf39704a8ca543fbbb2cb7b70 100644 --- a/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/BrowseCommand.java @@ -20,7 +20,7 @@ import de.prob.statespace.Transition; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/Command.java b/src/main/java/de/prob2/jupyter/commands/Command.java index 391c77a07b16ec2558a8fca6792b0c9a26cf96d8..f077cd10b7a10f63067b9d8de1198e5e74bc9dd8 100644 --- a/src/main/java/de/prob2/jupyter/commands/Command.java +++ b/src/main/java/de/prob2/jupyter/commands/Command.java @@ -2,7 +2,7 @@ package de.prob2.jupyter.commands; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/CommandUtils.java b/src/main/java/de/prob2/jupyter/commands/CommandUtils.java index 368ea178307d66743ea6112624b52d10515e5d03..5699dad613c3636fb5c49e17bb9d1f2bb5e44abd 100644 --- a/src/main/java/de/prob2/jupyter/commands/CommandUtils.java +++ b/src/main/java/de/prob2/jupyter/commands/CommandUtils.java @@ -15,7 +15,7 @@ import de.prob.unicode.UnicodeTranslator; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java b/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java index 32ff5cba2bfe8509a8998c12546cc0a9b7bf30af..f81acc94b9c40a0e7840ccfc5d36d576f561ac57 100644 --- a/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/ConstantsCommand.java @@ -12,7 +12,7 @@ import de.prob.statespace.Transition; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/EvalCommand.java b/src/main/java/de/prob2/jupyter/commands/EvalCommand.java index 25029d61c1907a9f704084a2ec4e9f6919e18d03..6b98fec5e1dc743e3b2b6a9aa08b1bec75269759 100644 --- a/src/main/java/de/prob2/jupyter/commands/EvalCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/EvalCommand.java @@ -7,7 +7,7 @@ import de.prob.statespace.AnimationSelector; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/ExecCommand.java b/src/main/java/de/prob2/jupyter/commands/ExecCommand.java index a1840623b21ea71bc53ce752cd01d660ba91937d..4335874f59067a881120d4a0e18a8d44efb21552 100644 --- a/src/main/java/de/prob2/jupyter/commands/ExecCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/ExecCommand.java @@ -14,7 +14,7 @@ import de.prob.statespace.Transition; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java b/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java index df1a56b84fb5fc8e423ced1e78be33092be14acd..b0d2ff2b10b16696ac6fc3ef02efe8659cbb0196 100644 --- a/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/GroovyCommand.java @@ -11,7 +11,7 @@ import de.prob.scripting.ScriptEngineProvider; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/HelpCommand.java b/src/main/java/de/prob2/jupyter/commands/HelpCommand.java index a502f52d93cd0138dbc7ac2d27415f5e17aa3299..81cb794d68afe1ec7dfd4922123aa3d1d3d4d4c5 100644 --- a/src/main/java/de/prob2/jupyter/commands/HelpCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/HelpCommand.java @@ -8,7 +8,7 @@ import com.google.inject.Inject; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java b/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java index df74e337be4f853a50ef6b4edc61ef38bd64f01b..84177e08d902c1142ba5876b042bf78f39f5ddf5 100644 --- a/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/InitialiseCommand.java @@ -12,7 +12,7 @@ import de.prob.statespace.Transition; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java b/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java index 57c04fab41378dbed9fe48390c7b6390010ee084..ff2cae4096e9424909f74778e68a9647ee6592c2 100644 --- a/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/LoadCellCommand.java @@ -12,7 +12,7 @@ import de.prob.statespace.Trace; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java b/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java index 606c46c1c100e5b1649403bdaa9558ef0b7f4056..2a4d7c61c2e6417487d7c16f6b95ae95e980da20 100644 --- a/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/LoadFileCommand.java @@ -14,7 +14,7 @@ import de.prob.statespace.Trace; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/PrefCommand.java b/src/main/java/de/prob2/jupyter/commands/PrefCommand.java index e6968a932cbd5ed999424b523246c8f98724bb8d..f8885d11df641dfe478c3efa519ca9b186822ed9 100644 --- a/src/main/java/de/prob2/jupyter/commands/PrefCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/PrefCommand.java @@ -15,7 +15,7 @@ import de.prob.statespace.AnimationSelector; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/SolveCommand.java b/src/main/java/de/prob2/jupyter/commands/SolveCommand.java index 039f7f8ebddb6a758f5cdce5569f487374b36b46..1cdbdb1cbba001943254ed3bd67805d6d7e0c408 100644 --- a/src/main/java/de/prob2/jupyter/commands/SolveCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/SolveCommand.java @@ -13,7 +13,7 @@ import de.prob.statespace.Trace; import de.prob2.jupyter.ProBKernel; import de.prob2.jupyter.UserErrorException; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/TimeCommand.java b/src/main/java/de/prob2/jupyter/commands/TimeCommand.java index d4993583d8dae4c033aa8a14d5e9a9d5ddf300e5..b982b057d64d3b9d0c32c45f2ed7a2525e1c743f 100644 --- a/src/main/java/de/prob2/jupyter/commands/TimeCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/TimeCommand.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/prob2/jupyter/commands/VersionCommand.java b/src/main/java/de/prob2/jupyter/commands/VersionCommand.java index 8df6aa45ed5aadde3ac056223cc13f9539f94b90..82348bf6826dcf7da8ef1ec39d0ca81959107837 100644 --- a/src/main/java/de/prob2/jupyter/commands/VersionCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/VersionCommand.java @@ -8,7 +8,7 @@ import de.prob.statespace.AnimationSelector; import de.prob2.jupyter.ProBKernel; -import io.github.spencerpark.jupyter.messages.DisplayData; +import io.github.spencerpark.jupyter.kernel.display.DisplayData; import org.jetbrains.annotations.NotNull;