File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed
main/java/org/scijava/ui/swing/script
test/java/org/scijava/script/parse Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 5
5
<parent >
6
6
<groupId >org.scijava</groupId >
7
7
<artifactId >pom-scijava</artifactId >
8
- <version >31.1.0 </version >
8
+ <version >32.0.0-beta-3 </version >
9
9
<relativePath />
10
10
</parent >
11
11
Original file line number Diff line number Diff line change @@ -132,8 +132,10 @@ private void installCustomActions() {
132
132
// actions that are not registered by default
133
133
map .put (rtaTimeDateAction , new TimeDateAction ());
134
134
map .put (clipboardHistoryAction , new ClipboardHistoryActionImpl ());
135
- if (map .get (rstaCopyAsStyledTextAction ) != null )
136
- map .put (rstaCopyAsStyledTextAction , new CopyAsStyledTextAction ());
135
+ // NB: This action is present in rsyntaxtextarea 3.1.1, but not 3.1.6.
136
+ // So we disable it for the time being.
137
+ //if (map.get(rstaCopyAsStyledTextAction) != null)
138
+ // map.put(rstaCopyAsStyledTextAction, new CopyAsStyledTextAction());
137
139
if (map .get (rstaGoToMatchingBracketAction ) != null )
138
140
map .put (rstaGoToMatchingBracketAction , new GoToMatchingBracketAction ());
139
141
Original file line number Diff line number Diff line change 39
39
import javax .script .ScriptException ;
40
40
41
41
import org .scijava .parsington .Variable ;
42
- import org .scijava .parsington .eval .DefaultEvaluator ;
42
+ import org .scijava .parsington .eval .DefaultTreeEvaluator ;
43
43
import org .scijava .parsington .eval .Evaluator ;
44
44
import org .scijava .script .AbstractScriptEngine ;
45
45
@@ -95,7 +95,7 @@ else if (args instanceof Collection) {
95
95
public ParsingtonScriptEngine () {
96
96
// NB: Create a default evaluator, but extended to support method calls.
97
97
// This is a first-cut hack, just for fun -- fields are not supported yet.
98
- this (new DefaultEvaluator () {
98
+ this (new DefaultTreeEvaluator () {
99
99
100
100
@ Override
101
101
public Object dot (final Object a , final Object b ) {
You can’t perform that action at this time.
0 commit comments