Skip to content

Commit 7864d0f

Browse files
committed
POM: update parent to pom-scijava 32.0.0-beta-3
Unfortunately, the CopyAsStyledTextAction is not present in rsyntaxtextarea 3.1.6, so I disabled it for now.
1 parent a647f94 commit 7864d0f

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>31.1.0</version>
8+
<version>32.0.0-beta-3</version>
99
<relativePath />
1010
</parent>
1111

src/main/java/org/scijava/ui/swing/script/EditorPaneActions.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,10 @@ private void installCustomActions() {
132132
// actions that are not registered by default
133133
map.put(rtaTimeDateAction, new TimeDateAction());
134134
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());
137139
if (map.get(rstaGoToMatchingBracketAction) != null)
138140
map.put(rstaGoToMatchingBracketAction, new GoToMatchingBracketAction());
139141

src/test/java/org/scijava/script/parse/ParsingtonScriptEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import javax.script.ScriptException;
4040

4141
import org.scijava.parsington.Variable;
42-
import org.scijava.parsington.eval.DefaultEvaluator;
42+
import org.scijava.parsington.eval.DefaultTreeEvaluator;
4343
import org.scijava.parsington.eval.Evaluator;
4444
import org.scijava.script.AbstractScriptEngine;
4545

@@ -95,7 +95,7 @@ else if (args instanceof Collection) {
9595
public ParsingtonScriptEngine() {
9696
// NB: Create a default evaluator, but extended to support method calls.
9797
// This is a first-cut hack, just for fun -- fields are not supported yet.
98-
this(new DefaultEvaluator() {
98+
this(new DefaultTreeEvaluator() {
9999

100100
@Override
101101
public Object dot(final Object a, final Object b) {

0 commit comments

Comments
 (0)