Skip to content

Conversation

@tferr
Copy link
Contributor

No description provided.

@ctrueden
Copy link
Member

Thanks @tferr. The CI failure is due to an ongoing incompatibility between ImageJ and ImageJ2's legacy layer. It doesn't look like this update broke anything new AFAICT though, so I'm merging it now.

@ctruedenctrueden merged commit ab6a4da into scijava:masterMar 25, 2025
1 check failed
@tferrtferr deleted the patch-10 branch March 25, 2025 18:47
@ctrueden
Copy link
Member

There is actually a failure now with script-editor:

script-editor/src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java:[46,8] org.scijava.ui.swing.script.highliters.ImageJMacroTokenMaker is not abstract and does not override abstract method yystate() in org.fife.ui.rsyntaxtextarea.AbstractJFlexTokenMaker 

@tferr If you have time to fix it, great, otherwise I'll take a look as soon as I can, in conjunction with the other needed BOM fixes.

@tferr
Copy link
ContributorAuthor

@ctrueden, I will look at it. I have been using it on my computer without noticing anything (I always do before submitting a PR here). I guess I don't have the same versions of all dependencies!?. Will ping you if I need guidance.

@imagesc-bot
Copy link

This pull request has been mentioned on Image.sc Forum. There might be relevant details there:

https://forum.image.sc/t/fiji-friends-weekly-dev-update-thread/103718/84

tferr added a commit to scijava/script-editor that referenced this pull request Apr 24, 2025
This fixes the issue detailed in scijava/pom-scijava#288 Context: In newer versions of RSyntaxtTextArea, AbstractJFlexCTokenMaker adds an abstract yystate() method intended to return the current state of a JFlex lexer. Since it is abstract, it must be implemented by any concrete subclass, so we patch ImageJMacroTokenMaker so that the current zzLexicalState is returned Tested with: `mvn clean package -Denforcer.skip`
@tferr
Copy link
ContributorAuthor

@ctrueden , scijava/script-editor#72 should fix this

ctrueden pushed a commit to scijava/script-editor that referenced this pull request Apr 24, 2025
This fixes the issue detailed in scijava/pom-scijava#288. Context: In newer versions of RSyntaxtTextArea, AbstractJFlexCTokenMaker adds an abstract yystate() method intended to return the current state of a JFlex lexer. Since it is abstract, it must be implemented by any concrete subclass, so we patch ImageJMacroTokenMaker so that the current zzLexicalState is returned. Tested with: `mvn clean package -Denforcer.skip` Signed-off-by: Curtis Rueden <[email protected]>
ctrueden added a commit that referenced this pull request Apr 24, 2025
This accommodates RSyntaxTextArea 3.6.0; see #288.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tferr@ctrueden@imagesc-bot