Skip to content
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.

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

Add logic for migrating to Jaunch launcher #94

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
974f8d0
Update license blurbs for 2024
ctrueden Oct 18, 2024
4f70b9a
ImageJUpdater: let any/all services be null
ctrueden Oct 19, 2024
ff53573
ImageJUpdater: Do not update the updater separately
frauzufall Aug 19, 2019
237405d
POM: update parent to pom-scijava 39.0.0
ctrueden Nov 19, 2024
62e72e4
Add initial logic for migrating to Jaunch launcher
ctrueden Nov 21, 2024
78a901c
Add executable to upgrade comparison
hinerm Nov 25, 2024
5e4038f
Update ascii art for Windows
hinerm Nov 25, 2024
44459b1
Disable the migrator until its FIXMEs are done
ctrueden Jan 31, 2025
027980f
Remove Java 3D and ImgLib2 migrator table entries
ctrueden Jan 31, 2025
cb4dbc4
Rename Fiji Future -> Fiji Latest
ctrueden Jan 31, 2025
819ffef
Update license blurbs for 2025
ctrueden Jan 31, 2025
6fe428c
Call exitValue only if process completed
hinerm Feb 6, 2025
d8f0d20
Read process output on separate thread
hinerm Feb 6, 2025
9156255
TEMP enable upgrading
hinerm Feb 7, 2025
6692af8
Dispose context before shutting down
hinerm Feb 7, 2025
060f50c
Remove unused imports
hinerm Feb 19, 2025
b1ee0bb
Rename old launcher after upgrading
hinerm Feb 19, 2025
b26d7cc
FIXME add more fixmes for shortcut/update sites
hinerm Feb 25, 2025
1a9bb57
WIP add TODO for mac rename
hinerm Feb 25, 2025
d4b204c
WIP notify user of need to rename shortcuts
hinerm Feb 25, 2025
c39cea3
Rearrange things so we restart later
hinerm Feb 27, 2025
7b0711d
WIP: more warning
hinerm Feb 28, 2025
d09850b
WIP updating
hinerm Mar 11, 2025
070afd4
WIP abandon programmatic updating
hinerm Mar 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2009 - 2023, ImageJ developers.
Copyright (c) 2009 - 2025, ImageJ developers.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>34.1.0</version>
<version>39.0.0</version>
<relativePath />
</parent>

<groupId>net.imagej</groupId>
<artifactId>imagej-ui-swing</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>

<name>ImageJ UI: Swing</name>
<description>ImageJ UI for Java Swing.</description>
@@ -160,6 +160,7 @@
<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>

<app-launcher.version>2.0.0</app-launcher.version>
<jhotdraw.version>7.6.0</jhotdraw.version>
</properties>

@@ -189,6 +190,11 @@
</dependency>

<!-- SciJava dependencies -->
<dependency>
<groupId>org.scijava</groupId>
<artifactId>app-launcher</artifactId>
<version>${app-launcher.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-common</artifactId>
2 changes: 1 addition & 1 deletion src/main/java/net/imagej/ui/swing/SwingColorBar.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
2 changes: 1 addition & 1 deletion src/main/java/net/imagej/ui/swing/overlay/PointFigure.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
2 changes: 1 addition & 1 deletion src/main/java/net/imagej/ui/swing/tools/SwingLineTool.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
2 changes: 1 addition & 1 deletion src/main/java/net/imagej/ui/swing/tools/SwingTextTool.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* #%L
* ImageJ software for multidimensional image processing and analysis.
* %%
* Copyright (C) 2009 - 2023 ImageJ developers.
* Copyright (C) 2009 - 2025 ImageJ developers.
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
Loading