Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
ProofScriptParser
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
24
Issues
24
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sarah.grebing
ProofScriptParser
Commits
b31bfc68
Commit
b31bfc68
authored
Oct 06, 2017
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bigfix for exception in calling proof tree tab panes
parent
77f055d3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
5 deletions
+46
-5
DockFX/DockFX.iml
DockFX/DockFX.iml
+0
-2
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/ProofTreeController.java
.../iti/formal/psdbg/gui/controller/ProofTreeController.java
+7
-1
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
...java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
+8
-1
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/Utils.java
...ain/java/edu/kit/iti/formal/psdbg/gui/controls/Utils.java
+30
-0
ui/src/main/resources/edu/kit/iti/formal/psdbg/gui/debugger-ui.less
...n/resources/edu/kit/iti/formal/psdbg/gui/debugger-ui.less
+1
-1
No files found.
DockFX/DockFX.iml
View file @
b31bfc68
...
...
@@ -10,8 +10,6 @@
</content>
<orderEntry
type=
"inheritedJdk"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.logging.log4j:log4j-api:2.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.logging.log4j:log4j-core:2.6"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: junit:junit:4.12"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.hamcrest:hamcrest-core:1.3"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"PROVIDED"
name=
"Maven: org.projectlombok:lombok:1.16.16"
level=
"project"
/>
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/ProofTreeController.java
View file @
b31bfc68
...
...
@@ -200,8 +200,14 @@ public class ProofTreeController {
PTreeNode
nextNode
=
stateGraphWrapper
.
getStepOver
(
currentPointer
);
//if nextnode is null ask interpreter to execute next statement and compute next state
if
(
nextNode
!=
null
)
{
State
<
KeyData
>
lastState
=
this
.
statePointer
.
getState
();
this
.
statePointer
=
nextNode
;
setNewState
(
statePointer
.
getState
());
State
<
KeyData
>
state
=
this
.
statePointer
.
getState
();
if
(
state
.
getGoals
().
isEmpty
())
{
setNewState
(
lastState
);
}
else
{
setNewState
(
state
);
}
// setHighlightStmt(this.statePointer.getScriptstmt().getStartPosition(), this.statePointer.getScriptstmt().getStartPosition());
}
else
{
//no next node is present yet
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
View file @
b31bfc68
...
...
@@ -112,7 +112,14 @@ public class ProofTree extends BorderPane {
} else {
return object.name();
}*/
return
object
.
sequent
().
toString
();
String
nodeLabel
;
if
(
object
.
getAppliedRuleApp
()
!=
null
)
{
nodeLabel
=
object
.
getAppliedRuleApp
().
rule
().
displayName
();
}
else
{
nodeLabel
=
object
.
isClosed
()
?
"Closed Goal"
:
"Open Goal"
;
}
return
nodeLabel
;
// return object.sequent().toString();
}
@Override
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/Utils.java
View file @
b31bfc68
...
...
@@ -235,4 +235,34 @@ public class Utils {
return
String
.
valueOf
(
t
.
getData
().
getNode
().
serialNr
());
}
public
static
void
showClosedProofDialog
(
String
scriptName
)
{
Alert
alert
=
new
Alert
(
Alert
.
AlertType
.
INFORMATION
);
alert
.
setTitle
(
"Proof Closed"
);
alert
.
setHeaderText
(
"The proof is closed"
);
alert
.
setContentText
(
"The proof using "
+
scriptName
+
" is closed"
);
/*StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
ex.printStackTrace(pw);
String exceptionText = sw.toString();
Label label = new Label("The exception stacktrace was:");
TextArea textArea = new TextArea(exceptionText);
textArea.setEditable(false);
textArea.setWrapText(true);
textArea.setMaxWidth(Double.MAX_VALUE);
textArea.setMaxHeight(Double.MAX_VALUE);
GridPane.setVgrow(textArea, Priority.ALWAYS);
GridPane.setHgrow(textArea, Priority.ALWAYS);
GridPane expContent = new GridPane();
expContent.setMaxWidth(Double.MAX_VALUE);
expContent.add(label, 0, 0);
expContent.add(textArea, 0, 1);
alert.getDialogPane().setExpandableContent(expContent);
*/
alert
.
showAndWait
();
}
}
ui/src/main/resources/edu/kit/iti/formal/psdbg/gui/debugger-ui.less
View file @
b31bfc68
...
...
@@ -283,7 +283,7 @@
}
.tab-pane {
-fx-skin: "edu.kit.iti.formal.psdb.gui.controls.CustomTabPaneSkin";
-fx-skin: "edu.kit.iti.formal.psdb
g
.gui.controls.CustomTabPaneSkin";
}
/**********************************************************************************************************************/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment