Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
sarah.grebing
ProofScriptParser
Commits
5c62d788
Commit
5c62d788
authored
Jul 18, 2017
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
09cf4838
49ee30e8
Pipeline
#12195
failed with stage
in 1 minute and 29 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/main/java/edu/kit/formal/gui/controls/ScriptController.java
...in/java/edu/kit/formal/gui/controls/ScriptController.java
+2
-2
src/main/java/edu/kit/formal/proofscriptparser/ast/CaseStatement.java
...a/edu/kit/formal/proofscriptparser/ast/CaseStatement.java
+1
-1
No files found.
src/main/java/edu/kit/formal/gui/controls/ScriptController.java
View file @
5c62d788
...
...
@@ -18,12 +18,12 @@ import javafx.collections.ObservableMap;
import
org.antlr.v4.runtime.CharStream
;
import
org.antlr.v4.runtime.CharStreams
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang.NotImplementedException
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.dockfx.DockNode
;
import
org.dockfx.DockPane
;
import
org.dockfx.DockPos
;
import
sun.reflect.generics.reflectiveObjects.NotImplementedException
;
import
java.io.File
;
import
java.io.IOException
;
...
...
@@ -99,7 +99,7 @@ public class ScriptController {
private
DockNode
createDockNode
(
ScriptArea
area
)
{
DockNode
dockNode
=
new
DockNode
(
area
,
area
.
getFilePath
().
getName
(),
new
MaterialDesignIconView
(
MaterialDesignIcon
.
FILE_DOCUMENT
));
dockNode
.
clos
abl
eProperty
().
addListener
(
o
->
{
dockNode
.
close
d
Property
().
addListener
(
o
->
{
openScripts
.
remove
(
area
);
});
area
.
filePathProperty
().
addListener
((
observable
,
oldValue
,
newValue
)
->
dockNode
.
setTitle
(
newValue
.
getName
()));
...
...
src/main/java/edu/kit/formal/proofscriptparser/ast/CaseStatement.java
View file @
5c62d788
...
...
@@ -52,6 +52,6 @@ public class CaseStatement extends Statement<ScriptLanguageParser.CasesListConte
* {@inheritDoc}
*/
@Override
public
CaseStatement
copy
()
{
return
new
CaseStatement
(
body
.
copy
(),
isClosedStmt
);
return
new
CaseStatement
(
isClosedStmt
,
body
.
copy
()
);
}
}
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