Skip to content

Commit b6d0c4a

Browse files
EMaksymenkoEMaksymenko
committed
Merge branch 'develop-NASA' into develop
# Conflicts: # gluegen-rt-natives-linux-amd64.jar # gluegen-rt-natives-macosx-universal.jar # gluegen-rt-natives-windows-amd64.jar # gluegen-rt.jar # jogl-all-natives-linux-amd64.jar # jogl-all-natives-macosx-universal.jar # jogl-all-natives-windows-amd64.jar # jogl-all.jar # src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java
2 parents 57b265b + 2543c23 commit b6d0c4a

File tree

84 files changed

+1711
-2880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1711
-2880
lines changed

‎build.gradle

+5-62
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
buildscript {
2-
dependencies {
3-
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
4-
}
5-
}
6-
7-
plugins {
8-
id 'com.jfrog.bintray' version '1.8.1'
9-
}
10-
111
apply plugin: 'java-library'
122
apply plugin: 'maven-publish'
13-
apply plugin: 'com.jfrog.artifactory'
143

154
group = 'earth.worldwind'
165
version = '2.3.0' + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
@@ -21,8 +10,8 @@ ant {
2110
}
2211

2312
ext {
24-
joglVersion = '2.4.0-rc-20200202'
25-
gdalVersion = '3.5.0'
13+
joglVersion = '2.5.0'
14+
gdalVersion = '3.10.0'
2615
jacksonVersion = '1.9.13'
2716
junitVersion = '4.5'
2817
//systemGDAL = true
@@ -31,11 +20,12 @@ ext {
3120
repositories {
3221
mavenLocal()
3322
mavenCentral()
23+
maven { url = "https://jogamp.org/deployment/maven/" }
3424
}
3525

3626
dependencies {
37-
implementation group: 'com.metsci.ext.org.jogamp.jogl', name: 'jogl-all-main', version:"$project.joglVersion"
38-
implementation group: 'com.metsci.ext.org.jogamp.gluegen', name: 'gluegen-rt-main', version:"$project.joglVersion"
27+
implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version:"$project.joglVersion"
28+
implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:"$project.joglVersion"
3929

4030
if (project.hasProperty('systemGDAL')) {
4131
implementation files("C:\\Program Files\\GDAL\\java\\gdal.jar")
@@ -129,53 +119,6 @@ publishing {
129119
}
130120
}
131121

132-
bintray {
133-
user = System.getenv('BINTRAY_USER')
134-
key = System.getenv('BINTRAY_API_KEY')
135-
publications = ['bintray']
136-
pkg {
137-
repo = System.getenv('BINTRAY_REPOSITORY')
138-
name = System.getenv('BINTRAY_PACKAGE')
139-
userOrg = System.getenv('BINTRAY_ORGANIZATION')
140-
desc = 'A community supported fork of the NASA WorldWind Java SDK (WWJ) ' +
141-
'is for building cross-platform 3D geospatial desktop applications in Java.'
142-
websiteUrl = 'https://worldwind.earth'
143-
issueTrackerUrl = 'https://github.com/WorldWindEarth/WorldWindJava/issues'
144-
vcsUrl = 'https://github.com/WorldWindEarth/WorldWindJava'
145-
licenses = ['NASA-1.3']
146-
labels = ['nasa', 'worldwind', 'worldwindjava', 'gis', 'geospatial',
147-
'globe', '3d', 'jogl', 'maps', 'imagery', 'terrain',
148-
'visualization', 'wms', 'wmts', 'shapes', 'shapefile', 'kml',
149-
'opengl', 'sdk-java', 'community-edition'
150-
]
151-
githubRepo = 'WorldWindEarth/WorldWindJava'
152-
version {
153-
name = project.version
154-
desc = "WorldWind v$project.version"
155-
vcsTag = System.getenv('TRAVIS_TAG')
156-
released = new Date()
157-
}
158-
}
159-
}
160-
161-
artifactory {
162-
contextUrl = 'https://oss.jfrog.org/artifactory'
163-
publish {
164-
repository {
165-
repoKey = 'oss-snapshot-local'
166-
username = System.getenv('BINTRAY_USER')
167-
password = System.getenv('BINTRAY_API_KEY')
168-
}
169-
defaults {
170-
publications('bintray')
171-
publishArtifacts = true
172-
}
173-
}
174-
if (project.hasProperty('build.number')) {
175-
clientConfig.info.setBuildNumber(project.getProperty('build.number'))
176-
}
177-
}
178-
179122
sourceSets {
180123
main {
181124
java {

‎nbproject/build-impl.xml

+30-58
Original file line numberDiff line numberDiff line change
@@ -119,43 +119,7 @@ is divided into following sections:
119119
<property name="module.name" value=""/>
120120
</target>
121121
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
122-
<j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
123-
<j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
124-
<j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
125-
<j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
126-
<condition property="platform.javac" value="${platform.home}/bin/javac">
127-
<equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
128-
</condition>
129-
<property name="platform.javac" value="${platform.javac.tmp}"/>
130-
<j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
131-
<condition property="platform.java" value="${platform.home}/bin/java">
132-
<equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
133-
</condition>
134-
<property name="platform.java" value="${platform.java.tmp}"/>
135-
<j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
136-
<condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
137-
<equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
138-
</condition>
139-
<property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
140-
<condition property="platform.invalid" value="true">
141-
<or>
142-
<contains string="${platform.javac}" substring="$${platforms."/>
143-
<contains string="${platform.java}" substring="$${platforms."/>
144-
<contains string="${platform.javadoc}" substring="$${platforms."/>
145-
</or>
146-
</condition>
147-
<fail unless="platform.home">Must set platform.home</fail>
148-
<fail unless="platform.bootcp">Must set platform.bootcp</fail>
149-
<fail unless="platform.java">Must set platform.java</fail>
150-
<fail unless="platform.javac">Must set platform.javac</fail>
151-
<fail if="platform.invalid">
152-
The J2SE Platform is not correctly set up.
153-
Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
154-
Either open the project in the IDE and setup the Platform with the same name or add it manually.
155-
For example like this:
156-
ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
157-
or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used)
158-
</fail>
122+
<property name="platform.java" value="${java.home}/bin/java"/>
159123
<available file="${manifest.file}" property="manifest.available"/>
160124
<condition property="splashscreen.available">
161125
<and>
@@ -278,6 +242,20 @@ is divided into following sections:
278242
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
279243
<isset property="profile.available"/>
280244
</condition>
245+
<condition else="false" property="jdkBug6558476">
246+
<and>
247+
<matches pattern="1\.[56]" string="${java.specification.version}"/>
248+
<not>
249+
<os family="unix"/>
250+
</not>
251+
</and>
252+
</condition>
253+
<condition else="false" property="javac.fork">
254+
<or>
255+
<istrue value="${jdkBug6558476}"/>
256+
<istrue value="${javac.external.vm}"/>
257+
</or>
258+
</condition>
281259
<property name="jar.index" value="false"/>
282260
<property name="jar.index.metainf" value="${jar.index}"/>
283261
<property name="copylibs.rebase" value="true"/>
@@ -365,7 +343,7 @@ is divided into following sections:
365343
</path>
366344
</resourcecount>
367345
</condition>
368-
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
346+
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
369347
<src>
370348
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
371349
<include name="*"/>
@@ -416,7 +394,7 @@ is divided into following sections:
416394
<property location="${build.dir}/empty" name="empty.dir"/>
417395
<mkdir dir="${empty.dir}"/>
418396
<mkdir dir="@{apgeneratedsrcdir}"/>
419-
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
397+
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
420398
<src>
421399
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
422400
<include name="*"/>
@@ -458,7 +436,7 @@ is divided into following sections:
458436
<sequential>
459437
<property location="${build.dir}/empty" name="empty.dir"/>
460438
<mkdir dir="${empty.dir}"/>
461-
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
439+
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
462440
<src>
463441
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
464442
<include name="*"/>
@@ -537,7 +515,7 @@ is divided into following sections:
537515
<element name="customizePrototype" optional="true"/>
538516
<sequential>
539517
<property name="junit.forkmode" value="perTest"/>
540-
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
518+
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
541519
<syspropertyset>
542520
<propertyref prefix="test-sys-prop."/>
543521
<mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -565,7 +543,7 @@ is divided into following sections:
565543
<element name="customizePrototype" optional="true"/>
566544
<sequential>
567545
<property name="junit.forkmode" value="perTest"/>
568-
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
546+
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
569547
<syspropertyset>
570548
<propertyref prefix="test-sys-prop."/>
571549
<mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -641,7 +619,7 @@ is divided into following sections:
641619
</fileset>
642620
</union>
643621
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
644-
<testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WorldWindJava" testname="TestNG tests" workingDir="${work.dir}">
622+
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WorldWindJava" testname="TestNG tests" workingDir="${work.dir}">
645623
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
646624
<propertyset>
647625
<propertyref prefix="test-sys-prop."/>
@@ -872,9 +850,6 @@ is divided into following sections:
872850
<classpath>
873851
<path path="@{classpath}"/>
874852
</classpath>
875-
<bootclasspath>
876-
<path path="${platform.bootcp}"/>
877-
</bootclasspath>
878853
</nbjpdastart>
879854
</sequential>
880855
</macrodef>
@@ -924,7 +899,7 @@ is divided into following sections:
924899
<attribute default="jvm" name="jvm"/>
925900
<element name="customize" optional="true"/>
926901
<sequential>
927-
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}">
902+
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
928903
<classpath>
929904
<path path="@{classpath}"/>
930905
</classpath>
@@ -958,7 +933,7 @@ is divided into following sections:
958933
<attribute default="jvm" name="jvm"/>
959934
<element name="customize" optional="true"/>
960935
<sequential>
961-
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
936+
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
962937
<classpath>
963938
<path path="@{classpath}"/>
964939
</classpath>
@@ -990,7 +965,7 @@ is divided into following sections:
990965
<attribute default="jvm" name="jvm"/>
991966
<element name="customize" optional="true"/>
992967
<sequential>
993-
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
968+
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
994969
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
995970
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
996971
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -1224,7 +1199,7 @@ is divided into following sections:
12241199
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
12251200
<echo level="info">To run this application from the command line without Ant, try:</echo>
12261201
<property location="${dist.jar}" name="dist.jar.resolved"/>
1227-
<echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
1202+
<echo level="info">java -jar "${dist.jar.resolved}"</echo>
12281203
</target>
12291204
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
12301205
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
@@ -1326,8 +1301,8 @@ is divided into following sections:
13261301
<isset property="main.class.available"/>
13271302
</and>
13281303
</condition>
1329-
<property name="platform.jlink" value="${platform.home}/bin/jlink"/>
1330-
<property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/>
1304+
<property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
1305+
<property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
13311306
<exec executable="${platform.jlink}">
13321307
<arg value="--module-path"/>
13331308
<arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
@@ -1520,19 +1495,16 @@ is divided into following sections:
15201495
</not>
15211496
</and>
15221497
</condition>
1523-
<exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
1524-
<arg value="-version"/>
1525-
</exec>
15261498
<condition else="" property="bug5101868workaround" value="*.java">
1527-
<matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
1499+
<matches pattern="1\.[56](\..*)?" string="${java.version}"/>
15281500
</condition>
15291501
<condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
15301502
<and>
15311503
<isset property="javadoc.html5"/>
1532-
<available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
1504+
<available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
15331505
</and>
15341506
</condition>
1535-
<javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
1507+
<javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
15361508
<classpath>
15371509
<path path="${javac.classpath}"/>
15381510
</classpath>

‎nbproject/configs/AnnotationControls.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.AnnotationControls

‎nbproject/configs/Cones.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.Cones

‎nbproject/configs/EGM2008Offsets.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.EGM2008Offsets

‎nbproject/configs/EGM96Offsets.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.EGM96Offsets

‎nbproject/configs/ExportImageOrElevations.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.ExportImageOrElevations

‎nbproject/configs/Placemarks.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.Placemarks

‎nbproject/configs/ScreenImageDragging.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.ScreenImageDragging

‎nbproject/genfiles.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=ed839dc9
1+
build.xml.data.CRC32=6106e3d1
22
build.xml.script.CRC32=b2ee8dee
3-
build.xml.stylesheet.CRC32=f85dc8f2@1.102.0.48
3+
build.xml.stylesheet.CRC32=f85dc8f2@1.108.0.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=ed839dc9
7-
nbproject/build-impl.xml.script.CRC32=2e7bce4f
8-
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.102.0.48
6+
nbproject/build-impl.xml.data.CRC32=6106e3d1
7+
nbproject/build-impl.xml.script.CRC32=43da2f27
8+
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.108.0.48

0 commit comments

Comments
 (0)