Skip to content

feat: Java 21 modernization — worldwindx.applications #21

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

Open
devin-ai-integration wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

feat: Java 21 modernization — worldwindx.applications #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e10eaf4
feat: retarget build to JDK 21
devin-ai-integration[bot] May 26, 2026
84c5d2a
chore: keep foundation diff to build config only
devin-ai-integration[bot] May 26, 2026
babf864
feat: Java 21 modernization — worldwindx applications
devin-ai-integration[bot] May 26, 2026
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ language: java

# Configure the build to use Oracle JDK 9
jdk:
- openjdk11
- openjdk21

# Install the Ant JUnit package, which is missing from the Travis CI environment. See the Travis documentation: https://docs.travis-ci.com/user/installing-dependencies/#Adding-APT-Packages
addons:
Expand Down
4 changes: 2 additions & 2 deletions nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=11
javac.target=11
javac.source=21
javac.target=21
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
2 changes: 1 addition & 1 deletion release-build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ worldwind.classes.dir=${worldwind.build.dir}/classes
worldwind.doc.dir=${worldwind.build.dir}/doc
worldwind.jar.dir=${worldwind.build.dir}/jar
worldwind.test.results.dir=${worldwind.build.dir}/test-results
worldwind.jdk=11
worldwind.jdk=21
#worldwind.exclude.jackson=true

# MIL-STD-2525 package build properties
Expand Down
2 changes: 1 addition & 1 deletion release-build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<pathelement location="gluegen-rt.jar"/>
<pathelement location="gdal.jar"/>
</classpath>
<link href="http://download.oracle.com/javase/8/docs/api/"/>
<link href="https://docs.oracle.com/en/java/javase/21/docs/api/"/>
<link href="https://jogamp.org/deployment/v2.4.0-rc-20200307/javadoc/"/>
</javadoc>
</target>
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwindx/applications/dataimporter/DataInstallerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ protected void initialize() {
// Search the layer list for layers that are also select listeners and register them with the World
// Window. This enables interactive layers to be included without specific knowledge of them here.
for (Layer layer : this.getWwd().getModel().getLayers()) {
if (layer instanceof SelectListener) {
this.getWwd().addSelectListener((SelectListener) layer);
if (layer instanceof SelectListener selectListener) {
this.getWwd().addSelectListener(selectListener);
}
}

Expand Down
9 changes: 4 additions & 5 deletions src/gov/nasa/worldwindx/applications/glider/GliderImageLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,10 @@ public void dispose() {
}

public void setImage(GliderImage image) throws IOException {
if (image.getImageSource() instanceof String) {
((SurfaceImageLayer) this.getImageLayer()).addImage((String) image.getImageSource(), image.getCorners());
} else if (image.getImageSource() instanceof BufferedImage) {
((SurfaceImageLayer) this.getImageLayer()).addImage(image.getName(), (BufferedImage) image.getImageSource(),
image.getSector());
if (image.getImageSource() instanceof String imageSource) {
((SurfaceImageLayer) this.getImageLayer()).addImage(imageSource, image.getCorners());
} else if (image.getImageSource() instanceof BufferedImage imageSource) {
((SurfaceImageLayer) this.getImageLayer()).addImage(image.getName(), imageSource, image.getSector());
} else {
throw new IllegalArgumentException("Unsupported image source type");
}
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwindx/applications/sar/SaveTrackDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ private FileFilter filterForFormat(int format)

for (FileFilter filter : this.fileChooser.getChoosableFileFilters())
{
if (filter instanceof SaveTrackFilter)
if (filter instanceof SaveTrackFilter saveTrackFilter)
{
if (((SaveTrackFilter) filter).getFormat() == format)
if (saveTrackFilter.getFormat() == format)
{
result = filter;
break;
Expand Down