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
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/view/BasicViewPropertyLimits.java
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ protected boolean is2DGlobe(Globe globe)

protected boolean isNonContinous2DGlobe(Globe globe)
{
return globe instanceof Globe2D && !((Globe2D) globe).isContinuous();
return globe instanceof Globe2D globe2D && !globe2D.isContinuous();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,8 @@ protected void onRotateView(Angle headingChange, Angle pitchChange,
return;
}

if (view instanceof BasicFlyView)
if (view instanceof BasicFlyView flyView)
{
BasicFlyView flyView = (BasicFlyView) view;
this.setPitch(flyView, this.uiAnimControl, flyView.getPitch().add(pitchChange),
actionAttribs);
this.setHeading(flyView, this.uiAnimControl, flyView.getHeading().add(headingChange),
Expand Down Expand Up @@ -509,9 +508,8 @@ protected void onRoll(Angle rollChange, ViewInputAttributes.ActionAttributes act
return;
}

if (view instanceof BasicFlyView)
if (view instanceof BasicFlyView flyView)
{
BasicFlyView flyView = (BasicFlyView) view;
this.setRoll(flyView, this.uiAnimControl, flyView.getRoll().add(rollChange), actionAttribs);

view.firePropertyChange(AVKey.VIEW, null, view);
Expand Down
16 changes: 7 additions & 9 deletions src/gov/nasa/worldwind/view/orbit/OrbitViewInputHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ protected void initializeInputHandlers()
protected boolean isNonContinous2DGlobe()
{
Globe globe = this.getWorldWindow().getModel().getGlobe();
return globe instanceof Globe2D && !((Globe2D) globe).isContinuous();
return globe instanceof Globe2D globe2D && !globe2D.isContinuous();
}

//**************************************************************//
Expand Down Expand Up @@ -511,9 +511,9 @@ protected void onVerticalTranslate(double translateChange, ViewInputAttributes.A
{
return;
}
if (view instanceof BasicOrbitView)
if (view instanceof BasicOrbitView basicOrbitView)
{
this.changeZoom((BasicOrbitView) view, uiAnimControl, translateChange, actionAttribs);
this.changeZoom(basicOrbitView, uiAnimControl, translateChange, actionAttribs);
}
}

Expand Down Expand Up @@ -587,9 +587,9 @@ protected void stopAllAnimators()
if (view == null)
return;

if (view instanceof BasicOrbitView)
if (view instanceof BasicOrbitView basicOrbitView)
{
((BasicOrbitView) view).setViewOutOfFocus(true);
basicOrbitView.setViewOutOfFocus(true);
}
}

Expand Down Expand Up @@ -1171,9 +1171,8 @@ public void addFlyToZoomAnimator(Angle heading, Angle pitch, double zoom)
throw new IllegalArgumentException(message);
}
View view = this.getView();
if (view instanceof OrbitView)
if (view instanceof OrbitView orbitView)
{
OrbitView orbitView = (OrbitView) view;
Angle beginHeading = orbitView.getHeading();
Angle beginPitch = orbitView.getPitch();
double beginZoom = orbitView.getZoom();
Expand Down Expand Up @@ -1225,9 +1224,8 @@ public void addCenterAnimator(Position begin, Position end, long lengthMillis, b
}

View view = this.getView();
if (view instanceof OrbitView)
if (view instanceof OrbitView orbitView)
{
OrbitView orbitView = (OrbitView) view;
Interpolator interpolator;
if (smoothed)
{
Expand Down