Skip to content

Use SWTImageJ as the default ImageJ implementation instead of SWT_AWT #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bio7 merged 9 commits into from
Oct 11, 2026
Merged

Use SWTImageJ as the default ImageJ implementation instead of SWT_AWT #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ede7752
Replaced the embedded AWT ImageJ (SWT_AWT bridge) with SWTImageJ.
Bio7 Oct 11, 2026
3202d0c
Use an absolute file URL for the local SWTImageJ repository in the ta…
Bio7 Oct 11, 2026
92b3288
Point the target platform to the local SWTImageJ bio7-host-hooks build.
Bio7 Oct 11, 2026
eca9717
Apply the theme colors of the ImageJ-Toolbar view to the SWTImageJ to…
Bio7 Oct 11, 2026
213a8d0
Bio7Grid disposes the images set in the table.
Bio7 Oct 11, 2026
4cbe684
Use the SWTImageJ integration update site in the target platform.
Bio7 Oct 11, 2026
38c1597
Add the SWTImageJ bundle to the plugin and dynamic compiler classpaths.
Bio7 Oct 11, 2026
3efc36c
Update POM for Java 25
Bio7 Oct 11, 2026
582c297
Pin CI Maven to 3.9.16 for Tycho nested-JAR compatibility
Copilot Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@ jobs:
java-version: '25'
java-package: 'jdk'

- name: Set up Maven
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
with:
maven-version: '3.9.16'

- name: Build with Maven
run: mvn -f com.eco.bio7.aggregator/pom.xml install --batch-mode --no-transfer-progress
2 changes: 1 addition & 1 deletion com.eco.bio7.WorldWind/src/com/eco/bio7/worldwind/WorldWindOptionsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@

import worldw.Activator;

import com.eco.bio7.image.CanvasView;
import com.eco.bio7.image.ui.CanvasView;
import com.eco.bio7.util.Util;
import com.eco.bio7.worldwind.swt.WorldWindowNewtCanvasSWT;
import com.swtdesigner.SWTResourceManager;
Expand Down
2 changes: 1 addition & 1 deletion com.eco.bio7.WorldWind/src/com/eco/bio7/worldwind/WorldWindView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
import org.eclipse.ui.part.ViewPart;
import org.rosuda.REngine.Rserve.RConnection;

import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;
import com.eco.bio7.worldwind.swt.NewtInputHandlerSWT;
import com.eco.bio7.worldwind.swt.StatusBar;
import com.eco.bio7.worldwind.swt.WorldWindowNewtAutoDrawableSWT;
Expand Down
3 changes: 2 additions & 1 deletion com.eco.bio7.ijmacro.editor/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.text,
org.eclipse.ui.ide,
org.eclipse.core.resources,
com.eco.bio7.image
com.eco.bio7.image,
com.eco.bio7.util
Eclipse-LazyStart: true
Import-Package: org.eclipse.ui.views.contentoutline
Bundle-ClassPath: bin/,
Expand Down
2 changes: 1 addition & 1 deletion com.eco.bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editor/actions/OpenColorDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

public class OpenColorDialog extends AbstractHandler {

Expand Down
2 changes: 1 addition & 1 deletion ....bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editor/actions/OpenColorDialogRGBToHex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

public class OpenColorDialogRGBToHex extends AbstractHandler {

Expand Down
2 changes: 1 addition & 1 deletion com.eco.bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editor/actions/OpenDirDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

public class OpenDirDialog extends AbstractHandler {
private String dir;
Expand Down
2 changes: 1 addition & 1 deletion com.eco.bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editor/actions/OpenFileDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

public class OpenFileDialog extends AbstractHandler {

Expand Down
2 changes: 1 addition & 1 deletion com.eco.bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editor/actions/SaveFileDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

public class SaveFileDialog extends AbstractHandler {

Expand Down
2 changes: 1 addition & 1 deletion ...bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editor/actions/color/OpenColorHexDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;

import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

/*For this class only a command is defined. It is used in the RColorInformationControl hover!*/
public class OpenColorHexDialog extends Action {
Expand Down
2 changes: 1 addition & 1 deletion ....ijmacro.editor/src/com/eco/bio7/ijmacro/editor/toolbar/debug/DebugSetVariableAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.swt.widgets.Shell;

import com.eco.bio7.ijmacro.editor.IJMacroEditorPlugin;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

import ij.macro.Interpreter;

Expand Down
2 changes: 1 addition & 1 deletion ...ijmacro.editor/src/com/eco/bio7/ijmacro/editor/toolbar/debug/EditSelBreakpointAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;


public class EditSelBreakpointAction extends AbstractRulerActionDelegate implements IEditorActionDelegate {
Expand Down
2 changes: 1 addition & 1 deletion ...tor/src/com/eco/bio7/ijmacro/editor/toolbar/debug/SetDebugBreakpointMacroValueDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
Expand Down
2 changes: 1 addition & 1 deletion ...jmacro.editor/src/com/eco/bio7/ijmacro/editor/toolbar/debug/SetDebugMacroValueDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

/*Class from: http://www.vogella.com/tutorials/EclipseDialogs/article.html*/

Expand Down
2 changes: 1 addition & 1 deletion ...src/com/eco/bio7/ijmacro/editor/toolbar/debug/ToggleDebugConditionalBreakpointAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import com.eco.bio7.image.Util;
import com.eco.bio7.util.Util;

public class ToggleDebugConditionalBreakpointAction extends AbstractRulerActionDelegate
implements IEditorActionDelegate {
Expand Down
8 changes: 6 additions & 2 deletions com.eco.bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editors/IJMacroEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
import com.eco.bio7.ijmacro.editor.outline.IJMacroEditorOutlineNode;
import com.eco.bio7.ijmacro.editor.outline.IJMacroEditorTreeContentProvider;
import com.eco.bio7.ijmacro.editor.toolbar.debug.DebugVariablesView;
import com.eco.bio7.image.CanvasView;
import com.eco.bio7.image.Util;
import com.eco.bio7.image.ui.CanvasView;
import com.eco.bio7.util.Util;

import ij.IJ;
import ij.WindowManager;
Expand All @@ -129,6 +129,10 @@
*/
public class IJMacroEditor extends TextEditor implements IPropertyChangeListener, Debugger {

/* Bio7 debug mode (not available in the ImageJ Debugger interface)! */
public static final int RUN_TO_EXPRESSION = 6;


private static final String TEMPLATE_PROPOSALS = "template_proposals_action";

private ColorManager colorManager;
Expand Down
2 changes: 1 addition & 1 deletion com.eco.bio7.ijmacro.editor/src/com/eco/bio7/ijmacro/editors/MacroRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public void run() {
interp.run(macro);
else {
if ("Popup Menu".equals(name)) {
PopupMenu popup = Menus.getPopupMenu();
org.eclipse.swt.widgets.Menu popup = Menus.getPopupMenu();
if (popup!=null) {
ImagePlus imp = null;
Object parent = popup.getParent();
Expand Down
1 change: 1 addition & 0 deletions com.eco.bio7.ijmacroedit.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ litigation.
<import plugin="org.eclipse.ui.ide" version="3.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.12.0" match="greaterOrEqual"/>
<import plugin="com.eco.bio7.image"/>
<import plugin="com.eco.bio7.util"/>
<import plugin="org.eclipse.ui.views"/>
</requires>

Expand Down
5 changes: 5 additions & 0 deletions com.eco.bio7.image.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ This Agreement is governed by the laws of the State of New York and the intellec
<discovery label="Bio7 Website" url="http://bio7.org"/>
</url>

<includes
id="org.eclipse.swt.imagej.feature"
version="0.0.0"/>

<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
Expand All @@ -132,6 +136,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.text"/>
<import plugin="com.eco.bio7.util"/>
</requires>

<plugin
Expand Down
Loading
Loading