Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
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
8 changes: 4 additions & 4 deletions src/gov/nasa/worldwindx/examples/BulkDownloadPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ public BulkDownloadPanel(WorldWindow wwd)
// Layers
for (Layer layer : this.wwd.getModel().getLayers())
{
if (layer instanceof BulkRetrievable)
this.retrievables.add(new BulkRetrievablePanel((BulkRetrievable) layer));
if (layer instanceof BulkRetrievable bulkRetrievable)
this.retrievables.add(new BulkRetrievablePanel(bulkRetrievable));
}
// Elevation models
CompoundElevationModel cem = (CompoundElevationModel) wwd.getModel().getGlobe().getElevationModel();
for (ElevationModel elevationModel : cem.getElevationModels())
{
if (elevationModel instanceof BulkRetrievable)
this.retrievables.add(new BulkRetrievablePanel((BulkRetrievable) elevationModel));
if (elevationModel instanceof BulkRetrievable bulkRetrievable)
this.retrievables.add(new BulkRetrievablePanel(bulkRetrievable));
}

// Init sector selector
Expand Down
8 changes: 4 additions & 4 deletions src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ protected void addObjectsToWorldWindow(Iterable<?> objectsToTrack) {

// Add the objects to track to the layers.
for (Object o : objectsToTrack) {
if (o instanceof WWIcon) {
iconLayer.addIcon((WWIcon) o);
} else if (o instanceof Renderable) {
shapesLayer.addRenderable((Renderable) o);
if (o instanceof WWIcon icon) {
iconLayer.addIcon(icon);
} else if (o instanceof Renderable renderable) {
shapesLayer.addRenderable(renderable);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/gov/nasa/worldwindx/examples/ScreenSelection.java
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ protected void highlightSelectedObjects(List<?> list)
// Turn on highlight if object selected.
for (Object o : list)
{
if (o instanceof Highlightable)
if (o instanceof Highlightable highlightable)
{
((Highlightable) o).setHighlighted(true);
this.lastBoxHighlightObjects.add((Highlightable) o);
highlightable.setHighlighted(true);
this.lastBoxHighlightObjects.add(highlightable);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ public void init(GLAutoDrawable glAutoDrawable) {
for (Attr attr : attrs) {
sb.append(attr.name).append(": ");

if (attr.attr instanceof Integer) {
gl.glGetIntegerv((Integer) attr.attr, intVals, 0);
if (attr.attr instanceof Integer attrValue) {
gl.glGetIntegerv(attrValue, intVals, 0);
sb.append(intVals[0]).append(intVals[1] > 0 ? ", " + intVals[1] : "");
}

Expand Down