Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProB 2 Jupyter Kernel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
general
stups
ProB 2 Jupyter Kernel
Commits
46eb8af4
Commit
46eb8af4
authored
Jun 4, 2018
by
dgelessus
Browse files
Options
Downloads
Patches
Plain Diff
Improve display of ProBErrors
parent
db789fad
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/de/prob2/jupyter/ProBKernel.java
+35
-4
35 additions, 4 deletions
src/main/java/de/prob2/jupyter/ProBKernel.java
with
35 additions
and
4 deletions
src/main/java/de/prob2/jupyter/ProBKernel.java
+
35
−
4
View file @
46eb8af4
package
de.prob2.jupyter
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.List
;
...
...
@@ -10,6 +12,8 @@ import java.util.regex.Pattern;
import
com.google.inject.Inject
;
import
com.google.inject.Injector
;
import
de.prob.animator.domainobjects.ErrorItem
;
import
de.prob.exception.ProBError
;
import
de.prob.scripting.ClassicalBFactory
;
import
de.prob.statespace.AnimationSelector
;
import
de.prob.statespace.Trace
;
...
...
@@ -40,7 +44,12 @@ import io.github.spencerpark.jupyter.kernel.display.DisplayData;
import
org.jetbrains.annotations.NotNull
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
public
final
class
ProBKernel
extends
BaseKernel
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ProBKernel
.
class
);
private
static
final
Pattern
COMMAND_PATTERN
=
Pattern
.
compile
(
"\\s*(\\:[^\\s]*)(?:\\h*(.*))?"
,
Pattern
.
DOTALL
);
private
final
@NotNull
AnimationSelector
animationSelector
;
...
...
@@ -133,10 +142,32 @@ public final class ProBKernel extends BaseKernel {
@Override
public
@NotNull
List
<
@NotNull
String
>
formatError
(
final
Exception
e
)
{
try
{
if
(
e
instanceof
UserErrorException
)
{
return
this
.
errorStyler
.
secondaryLines
(
e
.
getMessage
());
return
this
.
errorStyler
.
secondaryLines
(
String
.
valueOf
(
e
.
getMessage
()));
}
else
if
(
e
instanceof
ProBError
)
{
final
ProBError
proBError
=
(
ProBError
)
e
;
final
List
<
String
>
out
=
new
ArrayList
<>(
Arrays
.
asList
((
this
.
errorStyler
.
primary
(
"Error from ProB: "
)
+
this
.
errorStyler
.
secondary
(
String
.
valueOf
(
proBError
.
getOriginalMessage
()))
).
split
(
"\n"
)));
if
(
proBError
.
getErrors
().
isEmpty
())
{
out
.
addAll
(
this
.
errorStyler
.
primaryLines
(
"ProB returned no error messages.\n"
));
}
else
if
(
proBError
.
getErrors
().
size
()
==
1
)
{
out
.
addAll
(
this
.
errorStyler
.
secondaryLines
(
proBError
.
getErrors
().
get
(
0
).
toString
()));
}
else
{
out
.
addAll
(
this
.
errorStyler
.
primaryLines
(
proBError
.
getErrors
().
size
()
+
" errors:\n"
));
for
(
final
ErrorItem
error
:
proBError
.
getErrors
())
{
out
.
addAll
(
this
.
errorStyler
.
secondaryLines
(
error
.
toString
()));
}
}
return
out
;
}
else
{
return
super
.
formatError
(
e
);
}
}
catch
(
final
RuntimeException
e2
)
{
LOGGER
.
error
(
"Exception in error formatting"
,
e2
);
throw
e2
;
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment