From 5250a293742f3758b6a01fff584e6b0a6cde80f7 Mon Sep 17 00:00:00 2001 From: Mark Peterson Date: Wed, 12 Aug 2020 15:12:14 -0700 Subject: [PATCH] v2.2.0 release (#208) * Updated urls in documentation to use HTTPS wherever possible * Updated forum links to use HTTPS protocol * Repaired intermittent unit test failures due to random values * Repaired Travis CI build's broken link to Apache ANT binary * Corrected SurfaceText handling of cached extent. Fixes and closes #28. * Modified the ANT build to correctly assemble the release JAR files. Fixes #87. * README adjustments for new continuous integration - Simplified the opening paragraph and combined it with the Get Started section. Removed unnecessary GitHub issues link. - Updated the Releases and Roadmap section to reflect the new continuous integration structure. - Removed Daily Builds section, as daily builds have been shut down. Daily builds are expected to be replaced with a simple snapshot link in the Download section. - Removed API documentation links to decouple the website structure from the README file. * Travis CI adjustments for new continuous integration - Removed daily builds, which are scheduled to be replaced by Maven SNAPSHOT artifacts - Removed Javadoc publication to the World Wind website, which is now handled independently by the website itself - Modularized the change log script for interoperability with other World Wind repositories - Simplified Travis CI deployment tasks to reduce redundancy * Travis CI adjustments - Updated Travis CI to notify the World Wind team mailing list on every build * Corrected copy and paste typos in Travis CI configuration * Travis CI adjustments - Adjusted changelog.sh for TRAVIS build environment - Removed obsolete keystore and its decryption commands * Removed unnecessary entry from .gitignore * Restored default Travis CI notifications (#118) - Removed the custom notifications block from .travis.yml - Notifying everyone on every build is now unnecessary, as GitHub protected branches and mandatory pull requests ensure that only successful builds make it into the develop and master branches - Install the Ant JUnit packages missing from the Travis CI environment. - Closes #113 * Excluded local project files and build output - Updated .gitignore for project files per IntelliJ guidelines: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems - Eliminates spurious changes to project files from Android Studio automatic changes. * Update WorldWind Java documentation (#128) - Added ISSUE_TEMPLATE.md, which gives the guidelines for submitting an issue - Added PULL_REQUEST_TEMPLATE.md, which gives the guidelines for submitting a pull request - Added CONTRIBUTING.md, which gives the overall expectations for contributing to WorldWind Java, the coding and design guidelines, and resources for the WorldWind community - Removed "Design and Coding Guidelines.html"; this file's content was ported into CONTRIBUTING.md * Change "World Wind" to "WorldWind" (#129) All instances of "World Wind" in the source code and supporting documents have been changed to "WorldWind" * Fix broken NASA logo reference (#140) Path to NASA logo in README was broken, as our website infrastructure changed. It has been fixed. * Publish API documentation to gh-pages on every push to develop * Update README.md * Disabled Travis CI deployment in preparation for project suspension (#165) * Update README.md * Notice update * Notice alignment * Notice update * JDK version update * Build fix * JOGL and Java 11+ updates * Updated JOGL/GlueGen libs * Added jogl windows natives * Remove outdated jars * JOGL for OSX * Remove Scankort demo * Remove nbproject/private folder * Travis build fix * Travis build fix * Removed webstart build, fixed javadoc * Javadoc fixes * Javadoc fixes * Travis build fix * Javadoc fix * Remove local folder references * Test change * Test change * Test change * Test change * Move to JDK 11 and latest JOGL 2.4 on Linux * Update ISSUE_TEMPLATE.md (#170) File mistakenly linked to Web WorldWind resources. * JOGL 2.4 for Windows * JOGL for OSX * Update the code formatting to be more conformant * Revert "Update the code formatting to be more conformant" * Polyline deprecation fixes * Polyline deprecation fixes * Polyline deprecation fixes * Deprecation fixes * Deprecation/Lint fixes * Revert Polyline formatting * Formatting adjustments * GeoRSS fixes * Deprecation bug fixes * Build fixes * Logging run config * WebView deprecation * Moved Collada examples back to test code * Removed Collada code from incorrect location * JOGL refresh (#199) * Add jackson license (#202) * Add gdal license (#203) * WWMath unit test (#205) * License and release updates (#206) * Final release adjustments (#207) * Final release adjustments * Title adjustment Co-authored-by: pdavidc Co-authored-by: Zach Glueckert Co-authored-by: eirizarry Co-authored-by: Bruce Schubert Co-authored-by: markpet49 Co-authored-by: Miguel Del Castillo Co-authored-by: markpet49 --- .gitignore | 13 +- .idea/ant.xml | 9 - .idea/codeStyleSettings.xml | 227 --- .idea/compiler.xml | 48 - .idea/copyright/NASA.xml | 9 - .idea/copyright/profiles_settings.xml | 7 - .idea/encodings.xml | 5 - .idea/inspectionProfiles/Project_Default.xml | 23 - .../inspectionProfiles/profiles_settings.xml | 15 - .idea/libraries/gdal.xml | 9 - .idea/libraries/jogl.xml | 10 - .idea/libraries/junit4.xml | 9 - .idea/misc.xml | 69 - .idea/modules.xml | 9 - .idea/projectCodeStyle.xml | 202 -- .../runConfigurations/ApplicationTemplate.xml | 32 - .idea/runConfigurations/KMLViewer.xml | 32 - .idea/runConfigurations/WMSLayerManager.xml | 32 - .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 7 - .travis.yml | 85 +- Apache License 2.0.pdf | Bin 0 -> 196678 bytes CONTRIBUTING.md | 246 +++ Design and Coding Guidelines.html | 77 +- GDAL_README.txt | 44 +- ISSUE_TEMPLATE.md | 34 + .../gdal/data/LICENSE.TXT => LICENSE.gdal.TXT | 0 LICENSE.jackson.txt | 13 + LICENSE.txt | 249 --- PULL_REQUEST_TEMPLATE.md | 12 + README.md | 116 +- README_DEVELOPER.txt | 64 +- VPF_README.txt | 38 +- WebView32.dll | Bin 216576 -> 0 bytes WebView64.dll | Bin 256000 -> 0 bytes WorldWind.iml | 4 +- ...va-v2.2 3rd-party notices and licenses.pdf | Bin 0 -> 745792 bytes build.properties | 34 - build.xml | 621 +----- gluegen-rt-natives-linux-amd64.jar | Bin 4045 -> 4347 bytes gluegen-rt-natives-linux-i586.jar | Bin 4078 -> 0 bytes gluegen-rt-natives-macosx-universal.jar | Bin 4873 -> 3472 bytes gluegen-rt-natives-windows-amd64.jar | Bin 7928 -> 8710 bytes gluegen-rt-natives-windows-i586.jar | Bin 7353 -> 0 bytes gluegen-rt.jar | Bin 289164 -> 360966 bytes gluegen.LICENSE.txt | 72 +- jogl-all-natives-linux-amd64.jar | Bin 202008 -> 244531 bytes jogl-all-natives-linux-i586.jar | Bin 201020 -> 0 bytes jogl-all-natives-macosx-universal.jar | Bin 406088 -> 232725 bytes jogl-all-natives-windows-amd64.jar | Bin 216701 -> 227092 bytes jogl-all-natives-windows-i586.jar | Bin 187365 -> 0 bytes jogl-all.jar | Bin 3082059 -> 3568315 bytes jogl.LICENSE.txt | 69 +- jogl.README.txt | 9 +- keystore.tar.enc | Bin 10768 -> 0 bytes lib-external/gdal/GDAL_License.txt | 250 --- lib-external/jogl-gluegen/.gitignore | 2 + lib-external/jogl-gluegen/build-gluegen.sh | 6 + lib-external/jogl-gluegen/build-jogl.sh | 6 + lib-external/jogl-gluegen/clean-gluegen.sh | 7 + lib-external/jogl-gluegen/clean-jogl.sh | 7 + lib-external/jogl-gluegen/get-source.sh | 12 + lib-external/jogl-gluegen/linux-copy-jogl.sh | 11 + lib-external/jogl-gluegen/osx-copy-jogl.sh | 9 + .../jogl-gluegen/win-build-gluegen.cmd | 5 + lib-external/jogl-gluegen/win-build-jogl.cmd | 6 + .../jogl-gluegen/win-clean-gluegen.cmd | 5 + lib-external/jogl-gluegen/win-clean-jogl.cmd | 6 + lib-external/jogl-gluegen/win-copy-jogl.cmd | 11 + lib-external/webview/macosx/JNIUtil.h | 28 +- lib-external/webview/macosx/JNIUtil.m | 30 +- lib-external/webview/macosx/MacWebViewJNI.m | 28 +- lib-external/webview/macosx/OGLUtil.h | 28 +- lib-external/webview/macosx/OGLUtil.m | 28 +- .../webview/macosx/PropertyChangeListener.h | 28 +- .../webview/macosx/PropertyChangeListener.m | 28 +- lib-external/webview/macosx/ThreadSupport.h | 28 +- lib-external/webview/macosx/ThreadSupport.m | 28 +- .../macosx/WebDownloadCancelDelegate.h | 28 +- .../webview/macosx/WebDownloadController.h | 28 +- .../webview/macosx/WebDownloadController.m | 28 +- lib-external/webview/macosx/WebDownloadView.h | 28 +- lib-external/webview/macosx/WebDownloadView.m | 28 +- .../webview/macosx/WebResourceResolver.h | 28 +- .../webview/macosx/WebResourceResolver.m | 30 +- lib-external/webview/macosx/WebViewWindow.h | 28 +- lib-external/webview/macosx/WebViewWindow.m | 28 +- .../webview/macosx/WebViewWindowController.h | 28 +- .../webview/macosx/WebViewWindowController.m | 28 +- lib-external/webview/macosx/build.sh | 28 +- .../webview/windows/AWTEventSupport.cpp | 28 +- .../webview/windows/AWTEventSupport.h | 28 +- lib-external/webview/windows/HTMLMoniker.cpp | 28 +- lib-external/webview/windows/HTMLMoniker.h | 28 +- .../webview/windows/LinkParamCollection.h | 28 +- lib-external/webview/windows/LinkParams.h | 28 +- lib-external/webview/windows/Makefile | 28 +- .../webview/windows/NotificationAdapter.cpp | 28 +- .../webview/windows/NotificationAdapter.h | 28 +- lib-external/webview/windows/README.txt | 2 +- .../webview/windows/WebResourceResolver.cpp | 28 +- .../webview/windows/WebResourceResolver.h | 28 +- .../webview/windows/WebViewProtocol.cpp | 28 +- .../webview/windows/WebViewProtocol.h | 28 +- .../windows/WebViewProtocolFactory.cpp | 28 +- .../webview/windows/WebViewProtocolFactory.h | 28 +- .../webview/windows/WebViewWindow.cpp | 28 +- lib-external/webview/windows/WebViewWindow.h | 28 +- .../webview/windows/WindowsWebViewJNI.cpp | 28 +- .../webview/windows/WindowsWebViewJNI.h | 28 +- lib-external/webview/windows/dllmain.cpp | 28 +- lib-external/webview/windows/stdafx.cpp | 28 +- lib-external/webview/windows/util/JNIUtil.cpp | 28 +- lib-external/webview/windows/util/JNIUtil.h | 28 +- lib-external/webview/windows/util/Logging.cpp | 28 +- lib-external/webview/windows/util/Logging.h | 28 +- lib-external/webview/windows/util/MutexLock.h | 28 +- lib-external/webview/windows/util/WinUtil.cpp | 28 +- lib-external/webview/windows/util/WinUtil.h | 28 +- libwebview.jnilib | Bin 118500 -> 0 bytes logging.properties | 28 +- milstd2525/fills/tacsym/-f-------------.svg | 28 +- milstd2525/fills/tacsym/-fa------------.svg | 28 +- milstd2525/fills/tacsym/-ff------------.svg | 28 +- milstd2525/fills/tacsym/-fg------------.svg | 28 +- milstd2525/fills/tacsym/-fg-e----------.svg | 28 +- milstd2525/fills/tacsym/-fg-i----------.svg | 28 +- milstd2525/fills/tacsym/-fg-u----------.svg | 28 +- milstd2525/fills/tacsym/-fp------------.svg | 28 +- milstd2525/fills/tacsym/-fs------------.svg | 28 +- milstd2525/fills/tacsym/-fu------------.svg | 28 +- milstd2525/fills/tacsym/-fz------------.svg | 28 +- milstd2525/fills/tacsym/-h-------------.svg | 28 +- milstd2525/fills/tacsym/-ha------------.svg | 28 +- milstd2525/fills/tacsym/-hf------------.svg | 28 +- milstd2525/fills/tacsym/-hg------------.svg | 28 +- milstd2525/fills/tacsym/-hg-e----------.svg | 28 +- milstd2525/fills/tacsym/-hg-i----------.svg | 28 +- milstd2525/fills/tacsym/-hg-u----------.svg | 28 +- milstd2525/fills/tacsym/-hp------------.svg | 28 +- milstd2525/fills/tacsym/-hs------------.svg | 28 +- milstd2525/fills/tacsym/-hu------------.svg | 28 +- milstd2525/fills/tacsym/-hz------------.svg | 28 +- milstd2525/fills/tacsym/-n-------------.svg | 28 +- milstd2525/fills/tacsym/-na------------.svg | 28 +- milstd2525/fills/tacsym/-nf------------.svg | 28 +- milstd2525/fills/tacsym/-ng------------.svg | 28 +- milstd2525/fills/tacsym/-ng-e----------.svg | 28 +- milstd2525/fills/tacsym/-ng-i----------.svg | 28 +- milstd2525/fills/tacsym/-ng-u----------.svg | 28 +- milstd2525/fills/tacsym/-np------------.svg | 28 +- milstd2525/fills/tacsym/-ns------------.svg | 28 +- milstd2525/fills/tacsym/-nu------------.svg | 28 +- milstd2525/fills/tacsym/-nz------------.svg | 28 +- milstd2525/fills/tacsym/-u-------------.svg | 28 +- milstd2525/fills/tacsym/-ua------------.svg | 28 +- milstd2525/fills/tacsym/-uf------------.svg | 28 +- milstd2525/fills/tacsym/-ug------------.svg | 28 +- milstd2525/fills/tacsym/-ug-e----------.svg | 28 +- milstd2525/fills/tacsym/-ug-i----------.svg | 28 +- milstd2525/fills/tacsym/-ug-u----------.svg | 28 +- milstd2525/fills/tacsym/-up------------.svg | 28 +- milstd2525/fills/tacsym/-us------------.svg | 28 +- milstd2525/fills/tacsym/-uu------------.svg | 28 +- milstd2525/fills/tacsym/-uz------------.svg | 28 +- milstd2525/frames/tacsym/-a-a-----------.svg | 28 +- milstd2525/frames/tacsym/-a-p-----------.svg | 28 +- milstd2525/frames/tacsym/-aaa-----------.svg | 28 +- milstd2525/frames/tacsym/-aap-----------.svg | 28 +- milstd2525/frames/tacsym/-afa-----------.svg | 28 +- milstd2525/frames/tacsym/-afp-----------.svg | 28 +- milstd2525/frames/tacsym/-aga-----------.svg | 28 +- milstd2525/frames/tacsym/-agae----------.svg | 28 +- milstd2525/frames/tacsym/-agai----------.svg | 28 +- milstd2525/frames/tacsym/-agau----------.svg | 28 +- milstd2525/frames/tacsym/-agp-----------.svg | 28 +- milstd2525/frames/tacsym/-agpe----------.svg | 28 +- milstd2525/frames/tacsym/-agpi----------.svg | 28 +- milstd2525/frames/tacsym/-agpu----------.svg | 28 +- milstd2525/frames/tacsym/-apa-----------.svg | 28 +- milstd2525/frames/tacsym/-app-----------.svg | 28 +- milstd2525/frames/tacsym/-asa-----------.svg | 28 +- milstd2525/frames/tacsym/-asp-----------.svg | 28 +- milstd2525/frames/tacsym/-aua-----------.svg | 28 +- milstd2525/frames/tacsym/-aup-----------.svg | 28 +- milstd2525/frames/tacsym/-aza-----------.svg | 28 +- milstd2525/frames/tacsym/-azp-----------.svg | 28 +- milstd2525/frames/tacsym/-d-a-----------.svg | 28 +- milstd2525/frames/tacsym/-d-p-----------.svg | 28 +- milstd2525/frames/tacsym/-daa-----------.svg | 28 +- milstd2525/frames/tacsym/-dap-----------.svg | 28 +- milstd2525/frames/tacsym/-dfa-----------.svg | 28 +- milstd2525/frames/tacsym/-dfp-----------.svg | 28 +- milstd2525/frames/tacsym/-dga-----------.svg | 28 +- milstd2525/frames/tacsym/-dgae----------.svg | 28 +- milstd2525/frames/tacsym/-dgai----------.svg | 28 +- milstd2525/frames/tacsym/-dgau----------.svg | 28 +- milstd2525/frames/tacsym/-dgp-----------.svg | 28 +- milstd2525/frames/tacsym/-dgpe----------.svg | 28 +- milstd2525/frames/tacsym/-dgpi----------.svg | 28 +- milstd2525/frames/tacsym/-dgpu----------.svg | 28 +- milstd2525/frames/tacsym/-dpa-----------.svg | 28 +- milstd2525/frames/tacsym/-dpp-----------.svg | 28 +- milstd2525/frames/tacsym/-dsa-----------.svg | 28 +- milstd2525/frames/tacsym/-dsp-----------.svg | 28 +- milstd2525/frames/tacsym/-dua-----------.svg | 28 +- milstd2525/frames/tacsym/-dup-----------.svg | 28 +- milstd2525/frames/tacsym/-dza-----------.svg | 28 +- milstd2525/frames/tacsym/-dzp-----------.svg | 28 +- milstd2525/frames/tacsym/-f-a-----------.svg | 28 +- milstd2525/frames/tacsym/-f-p-----------.svg | 28 +- milstd2525/frames/tacsym/-faa-----------.svg | 28 +- milstd2525/frames/tacsym/-fap-----------.svg | 28 +- milstd2525/frames/tacsym/-ffa-----------.svg | 28 +- milstd2525/frames/tacsym/-ffp-----------.svg | 28 +- milstd2525/frames/tacsym/-fga-----------.svg | 28 +- milstd2525/frames/tacsym/-fgae----------.svg | 28 +- milstd2525/frames/tacsym/-fgai----------.svg | 28 +- milstd2525/frames/tacsym/-fgau----------.svg | 28 +- milstd2525/frames/tacsym/-fgp-----------.svg | 28 +- milstd2525/frames/tacsym/-fgpe----------.svg | 28 +- milstd2525/frames/tacsym/-fgpi----------.svg | 28 +- milstd2525/frames/tacsym/-fgpu----------.svg | 28 +- milstd2525/frames/tacsym/-fpa-----------.svg | 28 +- milstd2525/frames/tacsym/-fpp-----------.svg | 28 +- milstd2525/frames/tacsym/-fsa-----------.svg | 28 +- milstd2525/frames/tacsym/-fsp-----------.svg | 28 +- milstd2525/frames/tacsym/-fua-----------.svg | 28 +- milstd2525/frames/tacsym/-fup-----------.svg | 28 +- milstd2525/frames/tacsym/-fza-----------.svg | 28 +- milstd2525/frames/tacsym/-fzp-----------.svg | 28 +- milstd2525/frames/tacsym/-g-a-----------.svg | 28 +- milstd2525/frames/tacsym/-g-p-----------.svg | 28 +- milstd2525/frames/tacsym/-gaa-----------.svg | 28 +- milstd2525/frames/tacsym/-gap-----------.svg | 28 +- milstd2525/frames/tacsym/-gfa-----------.svg | 28 +- milstd2525/frames/tacsym/-gfp-----------.svg | 28 +- milstd2525/frames/tacsym/-gga-----------.svg | 28 +- milstd2525/frames/tacsym/-ggae----------.svg | 28 +- milstd2525/frames/tacsym/-ggai----------.svg | 28 +- milstd2525/frames/tacsym/-ggau----------.svg | 28 +- milstd2525/frames/tacsym/-ggp-----------.svg | 28 +- milstd2525/frames/tacsym/-ggpe----------.svg | 28 +- milstd2525/frames/tacsym/-ggpi----------.svg | 28 +- milstd2525/frames/tacsym/-ggpu----------.svg | 28 +- milstd2525/frames/tacsym/-gpa-----------.svg | 28 +- milstd2525/frames/tacsym/-gpp-----------.svg | 28 +- milstd2525/frames/tacsym/-gsa-----------.svg | 28 +- milstd2525/frames/tacsym/-gsp-----------.svg | 28 +- milstd2525/frames/tacsym/-gua-----------.svg | 28 +- milstd2525/frames/tacsym/-gup-----------.svg | 28 +- milstd2525/frames/tacsym/-gza-----------.svg | 28 +- milstd2525/frames/tacsym/-gzp-----------.svg | 28 +- milstd2525/frames/tacsym/-h-a-----------.svg | 28 +- milstd2525/frames/tacsym/-h-p-----------.svg | 28 +- milstd2525/frames/tacsym/-haa-----------.svg | 28 +- milstd2525/frames/tacsym/-hap-----------.svg | 28 +- milstd2525/frames/tacsym/-hfa-----------.svg | 28 +- milstd2525/frames/tacsym/-hfp-----------.svg | 28 +- milstd2525/frames/tacsym/-hga-----------.svg | 28 +- milstd2525/frames/tacsym/-hgae----------.svg | 28 +- milstd2525/frames/tacsym/-hgai----------.svg | 28 +- milstd2525/frames/tacsym/-hgau----------.svg | 28 +- milstd2525/frames/tacsym/-hgp-----------.svg | 28 +- milstd2525/frames/tacsym/-hgpe----------.svg | 28 +- milstd2525/frames/tacsym/-hgpi----------.svg | 28 +- milstd2525/frames/tacsym/-hgpu----------.svg | 28 +- milstd2525/frames/tacsym/-hpa-----------.svg | 28 +- milstd2525/frames/tacsym/-hpp-----------.svg | 28 +- milstd2525/frames/tacsym/-hsa-----------.svg | 28 +- milstd2525/frames/tacsym/-hsp-----------.svg | 28 +- milstd2525/frames/tacsym/-hua-----------.svg | 28 +- milstd2525/frames/tacsym/-hup-----------.svg | 28 +- milstd2525/frames/tacsym/-hza-----------.svg | 28 +- milstd2525/frames/tacsym/-hzp-----------.svg | 28 +- milstd2525/frames/tacsym/-j-a-----------.svg | 28 +- milstd2525/frames/tacsym/-j-p-----------.svg | 28 +- milstd2525/frames/tacsym/-jaa-----------.svg | 28 +- milstd2525/frames/tacsym/-jap-----------.svg | 28 +- milstd2525/frames/tacsym/-jfa-----------.svg | 28 +- milstd2525/frames/tacsym/-jfp-----------.svg | 28 +- milstd2525/frames/tacsym/-jga-----------.svg | 28 +- milstd2525/frames/tacsym/-jgae----------.svg | 28 +- milstd2525/frames/tacsym/-jgai----------.svg | 28 +- milstd2525/frames/tacsym/-jgau----------.svg | 28 +- milstd2525/frames/tacsym/-jgp-----------.svg | 28 +- milstd2525/frames/tacsym/-jgpe----------.svg | 28 +- milstd2525/frames/tacsym/-jgpi----------.svg | 28 +- milstd2525/frames/tacsym/-jgpu----------.svg | 28 +- milstd2525/frames/tacsym/-jpa-----------.svg | 28 +- milstd2525/frames/tacsym/-jpp-----------.svg | 28 +- milstd2525/frames/tacsym/-jsa-----------.svg | 28 +- milstd2525/frames/tacsym/-jsp-----------.svg | 28 +- milstd2525/frames/tacsym/-jua-----------.svg | 28 +- milstd2525/frames/tacsym/-jup-----------.svg | 28 +- milstd2525/frames/tacsym/-jza-----------.svg | 28 +- milstd2525/frames/tacsym/-jzp-----------.svg | 28 +- milstd2525/frames/tacsym/-k-a-----------.svg | 28 +- milstd2525/frames/tacsym/-k-p-----------.svg | 28 +- milstd2525/frames/tacsym/-kaa-----------.svg | 28 +- milstd2525/frames/tacsym/-kap-----------.svg | 28 +- milstd2525/frames/tacsym/-kfa-----------.svg | 28 +- milstd2525/frames/tacsym/-kfp-----------.svg | 28 +- milstd2525/frames/tacsym/-kga-----------.svg | 28 +- milstd2525/frames/tacsym/-kgae----------.svg | 28 +- milstd2525/frames/tacsym/-kgai----------.svg | 28 +- milstd2525/frames/tacsym/-kgau----------.svg | 28 +- milstd2525/frames/tacsym/-kgp-----------.svg | 28 +- milstd2525/frames/tacsym/-kgpe----------.svg | 28 +- milstd2525/frames/tacsym/-kgpi----------.svg | 28 +- milstd2525/frames/tacsym/-kgpu----------.svg | 28 +- milstd2525/frames/tacsym/-kpa-----------.svg | 28 +- milstd2525/frames/tacsym/-kpp-----------.svg | 28 +- milstd2525/frames/tacsym/-ksa-----------.svg | 28 +- milstd2525/frames/tacsym/-ksp-----------.svg | 28 +- milstd2525/frames/tacsym/-kua-----------.svg | 28 +- milstd2525/frames/tacsym/-kup-----------.svg | 28 +- milstd2525/frames/tacsym/-kza-----------.svg | 28 +- milstd2525/frames/tacsym/-kzp-----------.svg | 28 +- milstd2525/frames/tacsym/-l-a-----------.svg | 28 +- milstd2525/frames/tacsym/-l-p-----------.svg | 28 +- milstd2525/frames/tacsym/-laa-----------.svg | 28 +- milstd2525/frames/tacsym/-lap-----------.svg | 28 +- milstd2525/frames/tacsym/-lfa-----------.svg | 28 +- milstd2525/frames/tacsym/-lfp-----------.svg | 28 +- milstd2525/frames/tacsym/-lga-----------.svg | 28 +- milstd2525/frames/tacsym/-lgae----------.svg | 28 +- milstd2525/frames/tacsym/-lgai----------.svg | 28 +- milstd2525/frames/tacsym/-lgau----------.svg | 28 +- milstd2525/frames/tacsym/-lgp-----------.svg | 28 +- milstd2525/frames/tacsym/-lgpe----------.svg | 28 +- milstd2525/frames/tacsym/-lgpi----------.svg | 28 +- milstd2525/frames/tacsym/-lgpu----------.svg | 28 +- milstd2525/frames/tacsym/-lpa-----------.svg | 28 +- milstd2525/frames/tacsym/-lpp-----------.svg | 28 +- milstd2525/frames/tacsym/-lsa-----------.svg | 28 +- milstd2525/frames/tacsym/-lsp-----------.svg | 28 +- milstd2525/frames/tacsym/-lua-----------.svg | 28 +- milstd2525/frames/tacsym/-lup-----------.svg | 28 +- milstd2525/frames/tacsym/-lza-----------.svg | 28 +- milstd2525/frames/tacsym/-lzp-----------.svg | 28 +- milstd2525/frames/tacsym/-m-a-----------.svg | 28 +- milstd2525/frames/tacsym/-m-p-----------.svg | 28 +- milstd2525/frames/tacsym/-maa-----------.svg | 28 +- milstd2525/frames/tacsym/-map-----------.svg | 28 +- milstd2525/frames/tacsym/-mfa-----------.svg | 28 +- milstd2525/frames/tacsym/-mfp-----------.svg | 28 +- milstd2525/frames/tacsym/-mga-----------.svg | 28 +- milstd2525/frames/tacsym/-mgae----------.svg | 28 +- milstd2525/frames/tacsym/-mgai----------.svg | 28 +- milstd2525/frames/tacsym/-mgau----------.svg | 28 +- milstd2525/frames/tacsym/-mgp-----------.svg | 28 +- milstd2525/frames/tacsym/-mgpe----------.svg | 28 +- milstd2525/frames/tacsym/-mgpi----------.svg | 28 +- milstd2525/frames/tacsym/-mgpu----------.svg | 28 +- milstd2525/frames/tacsym/-mpa-----------.svg | 28 +- milstd2525/frames/tacsym/-mpp-----------.svg | 28 +- milstd2525/frames/tacsym/-msa-----------.svg | 28 +- milstd2525/frames/tacsym/-msp-----------.svg | 28 +- milstd2525/frames/tacsym/-mua-----------.svg | 28 +- milstd2525/frames/tacsym/-mup-----------.svg | 28 +- milstd2525/frames/tacsym/-mza-----------.svg | 28 +- milstd2525/frames/tacsym/-mzp-----------.svg | 28 +- milstd2525/frames/tacsym/-n-a-----------.svg | 28 +- milstd2525/frames/tacsym/-n-p-----------.svg | 28 +- milstd2525/frames/tacsym/-naa-----------.svg | 28 +- milstd2525/frames/tacsym/-nap-----------.svg | 28 +- milstd2525/frames/tacsym/-nfa-----------.svg | 28 +- milstd2525/frames/tacsym/-nfp-----------.svg | 28 +- milstd2525/frames/tacsym/-nga-----------.svg | 28 +- milstd2525/frames/tacsym/-ngae----------.svg | 28 +- milstd2525/frames/tacsym/-ngai----------.svg | 28 +- milstd2525/frames/tacsym/-ngau----------.svg | 28 +- milstd2525/frames/tacsym/-ngp-----------.svg | 28 +- milstd2525/frames/tacsym/-ngpe----------.svg | 28 +- milstd2525/frames/tacsym/-ngpi----------.svg | 28 +- milstd2525/frames/tacsym/-ngpu----------.svg | 28 +- milstd2525/frames/tacsym/-npa-----------.svg | 28 +- milstd2525/frames/tacsym/-npp-----------.svg | 28 +- milstd2525/frames/tacsym/-nsa-----------.svg | 28 +- milstd2525/frames/tacsym/-nsp-----------.svg | 28 +- milstd2525/frames/tacsym/-nua-----------.svg | 28 +- milstd2525/frames/tacsym/-nup-----------.svg | 28 +- milstd2525/frames/tacsym/-nza-----------.svg | 28 +- milstd2525/frames/tacsym/-nzp-----------.svg | 28 +- milstd2525/frames/tacsym/-p-a-----------.svg | 28 +- milstd2525/frames/tacsym/-p-p-----------.svg | 28 +- milstd2525/frames/tacsym/-paa-----------.svg | 28 +- milstd2525/frames/tacsym/-pap-----------.svg | 28 +- milstd2525/frames/tacsym/-pfa-----------.svg | 28 +- milstd2525/frames/tacsym/-pfp-----------.svg | 28 +- milstd2525/frames/tacsym/-pga-----------.svg | 28 +- milstd2525/frames/tacsym/-pgae----------.svg | 28 +- milstd2525/frames/tacsym/-pgai----------.svg | 28 +- milstd2525/frames/tacsym/-pgau----------.svg | 28 +- milstd2525/frames/tacsym/-pgp-----------.svg | 28 +- milstd2525/frames/tacsym/-pgpe----------.svg | 28 +- milstd2525/frames/tacsym/-pgpi----------.svg | 28 +- milstd2525/frames/tacsym/-pgpu----------.svg | 28 +- milstd2525/frames/tacsym/-ppa-----------.svg | 28 +- milstd2525/frames/tacsym/-ppp-----------.svg | 28 +- milstd2525/frames/tacsym/-psa-----------.svg | 28 +- milstd2525/frames/tacsym/-psp-----------.svg | 28 +- milstd2525/frames/tacsym/-pua-----------.svg | 28 +- milstd2525/frames/tacsym/-pup-----------.svg | 28 +- milstd2525/frames/tacsym/-pza-----------.svg | 28 +- milstd2525/frames/tacsym/-pzp-----------.svg | 28 +- milstd2525/frames/tacsym/-s-a-----------.svg | 28 +- milstd2525/frames/tacsym/-s-p-----------.svg | 28 +- milstd2525/frames/tacsym/-saa-----------.svg | 28 +- milstd2525/frames/tacsym/-sap-----------.svg | 28 +- milstd2525/frames/tacsym/-sfa-----------.svg | 28 +- milstd2525/frames/tacsym/-sfp-----------.svg | 28 +- milstd2525/frames/tacsym/-sga-----------.svg | 28 +- milstd2525/frames/tacsym/-sgae----------.svg | 28 +- milstd2525/frames/tacsym/-sgai----------.svg | 28 +- milstd2525/frames/tacsym/-sgau----------.svg | 28 +- milstd2525/frames/tacsym/-sgp-----------.svg | 28 +- milstd2525/frames/tacsym/-sgpe----------.svg | 28 +- milstd2525/frames/tacsym/-sgpi----------.svg | 28 +- milstd2525/frames/tacsym/-sgpu----------.svg | 28 +- milstd2525/frames/tacsym/-spa-----------.svg | 28 +- milstd2525/frames/tacsym/-spp-----------.svg | 28 +- milstd2525/frames/tacsym/-ssa-----------.svg | 28 +- milstd2525/frames/tacsym/-ssp-----------.svg | 28 +- milstd2525/frames/tacsym/-sua-----------.svg | 28 +- milstd2525/frames/tacsym/-sup-----------.svg | 28 +- milstd2525/frames/tacsym/-sza-----------.svg | 28 +- milstd2525/frames/tacsym/-szp-----------.svg | 28 +- milstd2525/frames/tacsym/-u-a-----------.svg | 28 +- milstd2525/frames/tacsym/-u-p-----------.svg | 28 +- milstd2525/frames/tacsym/-uaa-----------.svg | 28 +- milstd2525/frames/tacsym/-uap-----------.svg | 28 +- milstd2525/frames/tacsym/-ufa-----------.svg | 28 +- milstd2525/frames/tacsym/-ufp-----------.svg | 28 +- milstd2525/frames/tacsym/-uga-----------.svg | 28 +- milstd2525/frames/tacsym/-ugae----------.svg | 28 +- milstd2525/frames/tacsym/-ugai----------.svg | 28 +- milstd2525/frames/tacsym/-ugau----------.svg | 28 +- milstd2525/frames/tacsym/-ugp-----------.svg | 28 +- milstd2525/frames/tacsym/-ugpe----------.svg | 28 +- milstd2525/frames/tacsym/-ugpi----------.svg | 28 +- milstd2525/frames/tacsym/-ugpu----------.svg | 28 +- milstd2525/frames/tacsym/-upa-----------.svg | 28 +- milstd2525/frames/tacsym/-upp-----------.svg | 28 +- milstd2525/frames/tacsym/-usa-----------.svg | 28 +- milstd2525/frames/tacsym/-usp-----------.svg | 28 +- milstd2525/frames/tacsym/-uua-----------.svg | 28 +- milstd2525/frames/tacsym/-uup-----------.svg | 28 +- milstd2525/frames/tacsym/-uza-----------.svg | 28 +- milstd2525/frames/tacsym/-uzp-----------.svg | 28 +- milstd2525/frames/tacsym/-w-a-----------.svg | 28 +- milstd2525/frames/tacsym/-w-p-----------.svg | 28 +- milstd2525/frames/tacsym/-waa-----------.svg | 28 +- milstd2525/frames/tacsym/-wap-----------.svg | 28 +- milstd2525/frames/tacsym/-wfa-----------.svg | 28 +- milstd2525/frames/tacsym/-wfp-----------.svg | 28 +- milstd2525/frames/tacsym/-wga-----------.svg | 28 +- milstd2525/frames/tacsym/-wgae----------.svg | 28 +- milstd2525/frames/tacsym/-wgai----------.svg | 28 +- milstd2525/frames/tacsym/-wgau----------.svg | 28 +- milstd2525/frames/tacsym/-wgp-----------.svg | 28 +- milstd2525/frames/tacsym/-wgpe----------.svg | 28 +- milstd2525/frames/tacsym/-wgpi----------.svg | 28 +- milstd2525/frames/tacsym/-wgpu----------.svg | 28 +- milstd2525/frames/tacsym/-wpa-----------.svg | 28 +- milstd2525/frames/tacsym/-wpp-----------.svg | 28 +- milstd2525/frames/tacsym/-wsa-----------.svg | 28 +- milstd2525/frames/tacsym/-wsp-----------.svg | 28 +- milstd2525/frames/tacsym/-wua-----------.svg | 28 +- milstd2525/frames/tacsym/-wup-----------.svg | 28 +- milstd2525/frames/tacsym/-wza-----------.svg | 28 +- milstd2525/frames/tacsym/-wzp-----------.svg | 28 +- milstd2525/icons/ems/effaa----------.svg | 28 +- milstd2525/icons/ems/effaaa---------.svg | 28 +- milstd2525/icons/ems/effaab---------.svg | 28 +- milstd2525/icons/ems/effaac---------.svg | 28 +- milstd2525/icons/ems/effaad---------.svg | 28 +- milstd2525/icons/ems/effaae---------.svg | 28 +- milstd2525/icons/ems/effaaf---------.svg | 28 +- milstd2525/icons/ems/effaag---------.svg | 28 +- milstd2525/icons/ems/effab----------.svg | 28 +- milstd2525/icons/ems/effaba---------.svg | 28 +- milstd2525/icons/ems/effabb---------.svg | 28 +- milstd2525/icons/ems/effabc---------.svg | 28 +- milstd2525/icons/ems/effabd---------.svg | 28 +- milstd2525/icons/ems/effabe---------.svg | 28 +- milstd2525/icons/ems/effabf---------.svg | 28 +- milstd2525/icons/ems/effac----------.svg | 28 +- milstd2525/icons/ems/effaca---------.svg | 28 +- milstd2525/icons/ems/effacb---------.svg | 28 +- milstd2525/icons/ems/effacc---------.svg | 28 +- milstd2525/icons/ems/effacd---------.svg | 28 +- milstd2525/icons/ems/efface---------.svg | 28 +- milstd2525/icons/ems/effacf---------.svg | 28 +- milstd2525/icons/ems/effacg---------.svg | 28 +- milstd2525/icons/ems/effach---------.svg | 28 +- milstd2525/icons/ems/effaci---------.svg | 28 +- milstd2525/icons/ems/effacj---------.svg | 28 +- milstd2525/icons/ems/effad----------.svg | 28 +- milstd2525/icons/ems/effada---------.svg | 28 +- milstd2525/icons/ems/effadb---------.svg | 28 +- milstd2525/icons/ems/effaea---------.svg | 28 +- milstd2525/icons/ems/effaeb---------.svg | 28 +- milstd2525/icons/ems/effaee---------.svg | 28 +- milstd2525/icons/ems/effaf----------.svg | 28 +- milstd2525/icons/ems/effag----------.svg | 28 +- milstd2525/icons/ems/effaga---------.svg | 28 +- milstd2525/icons/ems/effah----------.svg | 28 +- milstd2525/icons/ems/effaha---------.svg | 28 +- milstd2525/icons/ems/effahb---------.svg | 28 +- milstd2525/icons/ems/effai----------.svg | 28 +- milstd2525/icons/ems/effaia---------.svg | 28 +- milstd2525/icons/ems/effaib---------.svg | 28 +- milstd2525/icons/ems/effaic---------.svg | 28 +- milstd2525/icons/ems/effaid---------.svg | 28 +- milstd2525/icons/ems/effaj----------.svg | 28 +- milstd2525/icons/ems/effaja---------.svg | 28 +- milstd2525/icons/ems/effajb---------.svg | 28 +- milstd2525/icons/ems/effajc---------.svg | 28 +- milstd2525/icons/ems/effak----------.svg | 28 +- milstd2525/icons/ems/effakb---------.svg | 28 +- milstd2525/icons/ems/effala---------.svg | 28 +- milstd2525/icons/ems/effald---------.svg | 28 +- milstd2525/icons/ems/effale---------.svg | 28 +- milstd2525/icons/ems/effalf---------.svg | 28 +- milstd2525/icons/ems/effalh---------.svg | 28 +- milstd2525/icons/ems/effalj---------.svg | 28 +- milstd2525/icons/ems/effalk---------.svg | 28 +- milstd2525/icons/ems/effalm---------.svg | 28 +- milstd2525/icons/ems/effalo---------.svg | 28 +- milstd2525/icons/ems/effalp---------.svg | 28 +- milstd2525/icons/ems/effama---------.svg | 28 +- milstd2525/icons/ems/effamb---------.svg | 28 +- milstd2525/icons/ems/effamc---------.svg | 28 +- milstd2525/icons/ems/effamd---------.svg | 28 +- milstd2525/icons/ems/effame---------.svg | 28 +- milstd2525/icons/ems/effamf---------.svg | 28 +- milstd2525/icons/ems/effamg---------.svg | 28 +- milstd2525/icons/ems/effamh---------.svg | 28 +- milstd2525/icons/ems/effami---------.svg | 28 +- milstd2525/icons/ems/effpa----------.svg | 28 +- milstd2525/icons/ems/effpaa---------.svg | 28 +- milstd2525/icons/ems/effpab---------.svg | 28 +- milstd2525/icons/ems/effpac---------.svg | 28 +- milstd2525/icons/ems/effpad---------.svg | 28 +- milstd2525/icons/ems/effpae---------.svg | 28 +- milstd2525/icons/ems/effpaf---------.svg | 28 +- milstd2525/icons/ems/effpag---------.svg | 28 +- milstd2525/icons/ems/effpb----------.svg | 28 +- milstd2525/icons/ems/effpba---------.svg | 28 +- milstd2525/icons/ems/effpbb---------.svg | 28 +- milstd2525/icons/ems/effpbc---------.svg | 28 +- milstd2525/icons/ems/effpbd---------.svg | 28 +- milstd2525/icons/ems/effpbe---------.svg | 28 +- milstd2525/icons/ems/effpbf---------.svg | 28 +- milstd2525/icons/ems/effpc----------.svg | 28 +- milstd2525/icons/ems/effpca---------.svg | 28 +- milstd2525/icons/ems/effpcb---------.svg | 28 +- milstd2525/icons/ems/effpcc---------.svg | 28 +- milstd2525/icons/ems/effpcd---------.svg | 28 +- milstd2525/icons/ems/effpce---------.svg | 28 +- milstd2525/icons/ems/effpcf---------.svg | 28 +- milstd2525/icons/ems/effpcg---------.svg | 28 +- milstd2525/icons/ems/effpch---------.svg | 28 +- milstd2525/icons/ems/effpci---------.svg | 28 +- milstd2525/icons/ems/effpcj---------.svg | 28 +- milstd2525/icons/ems/effpd----------.svg | 28 +- milstd2525/icons/ems/effpda---------.svg | 28 +- milstd2525/icons/ems/effpdb---------.svg | 28 +- milstd2525/icons/ems/effpea---------.svg | 28 +- milstd2525/icons/ems/effpeb---------.svg | 28 +- milstd2525/icons/ems/effpee---------.svg | 28 +- milstd2525/icons/ems/effpf----------.svg | 28 +- milstd2525/icons/ems/effpg----------.svg | 28 +- milstd2525/icons/ems/effpga---------.svg | 28 +- milstd2525/icons/ems/effph----------.svg | 28 +- milstd2525/icons/ems/effpha---------.svg | 28 +- milstd2525/icons/ems/effphb---------.svg | 28 +- milstd2525/icons/ems/effpi----------.svg | 28 +- milstd2525/icons/ems/effpia---------.svg | 28 +- milstd2525/icons/ems/effpib---------.svg | 28 +- milstd2525/icons/ems/effpic---------.svg | 28 +- milstd2525/icons/ems/effpid---------.svg | 28 +- milstd2525/icons/ems/effpj----------.svg | 28 +- milstd2525/icons/ems/effpja---------.svg | 28 +- milstd2525/icons/ems/effpjb---------.svg | 28 +- milstd2525/icons/ems/effpjc---------.svg | 28 +- milstd2525/icons/ems/effpk----------.svg | 28 +- milstd2525/icons/ems/effpkb---------.svg | 28 +- milstd2525/icons/ems/effpla---------.svg | 28 +- milstd2525/icons/ems/effpld---------.svg | 28 +- milstd2525/icons/ems/effple---------.svg | 28 +- milstd2525/icons/ems/effplf---------.svg | 28 +- milstd2525/icons/ems/effplh---------.svg | 28 +- milstd2525/icons/ems/effplj---------.svg | 28 +- milstd2525/icons/ems/effplk---------.svg | 28 +- milstd2525/icons/ems/effplm---------.svg | 28 +- milstd2525/icons/ems/effplo---------.svg | 28 +- milstd2525/icons/ems/effplp---------.svg | 28 +- milstd2525/icons/ems/effpma---------.svg | 28 +- milstd2525/icons/ems/effpmb---------.svg | 28 +- milstd2525/icons/ems/effpmc---------.svg | 28 +- milstd2525/icons/ems/effpmd---------.svg | 28 +- milstd2525/icons/ems/effpme---------.svg | 28 +- milstd2525/icons/ems/effpmf---------.svg | 28 +- milstd2525/icons/ems/effpmg---------.svg | 28 +- milstd2525/icons/ems/effpmh---------.svg | 28 +- milstd2525/icons/ems/effpmi---------.svg | 28 +- milstd2525/icons/ems/efiaa----------.svg | 28 +- milstd2525/icons/ems/efiaac---------.svg | 28 +- milstd2525/icons/ems/efiab----------.svg | 28 +- milstd2525/icons/ems/efiaba---------.svg | 28 +- milstd2525/icons/ems/efiabc---------.svg | 28 +- milstd2525/icons/ems/efiabd---------.svg | 28 +- milstd2525/icons/ems/efiabf---------.svg | 28 +- milstd2525/icons/ems/efiac----------.svg | 28 +- milstd2525/icons/ems/efiaca---------.svg | 28 +- milstd2525/icons/ems/efiacb---------.svg | 28 +- milstd2525/icons/ems/efiacc---------.svg | 28 +- milstd2525/icons/ems/efiacd---------.svg | 28 +- milstd2525/icons/ems/efiace---------.svg | 28 +- milstd2525/icons/ems/efiacf---------.svg | 28 +- milstd2525/icons/ems/efiacg---------.svg | 28 +- milstd2525/icons/ems/efiach---------.svg | 28 +- milstd2525/icons/ems/efiad----------.svg | 28 +- milstd2525/icons/ems/efiada---------.svg | 28 +- milstd2525/icons/ems/efiadb---------.svg | 28 +- milstd2525/icons/ems/efiadc---------.svg | 28 +- milstd2525/icons/ems/efiadd---------.svg | 28 +- milstd2525/icons/ems/efiade---------.svg | 28 +- milstd2525/icons/ems/efiadf---------.svg | 28 +- milstd2525/icons/ems/efiadg---------.svg | 28 +- milstd2525/icons/ems/efiadh---------.svg | 28 +- milstd2525/icons/ems/efiadi---------.svg | 28 +- milstd2525/icons/ems/efiadj---------.svg | 28 +- milstd2525/icons/ems/efiadk---------.svg | 28 +- milstd2525/icons/ems/efiadl---------.svg | 28 +- milstd2525/icons/ems/efiadm---------.svg | 28 +- milstd2525/icons/ems/efiadn---------.svg | 28 +- milstd2525/icons/ems/efiado---------.svg | 28 +- milstd2525/icons/ems/efiae----------.svg | 28 +- milstd2525/icons/ems/efiaea---------.svg | 28 +- milstd2525/icons/ems/efiaf----------.svg | 28 +- milstd2525/icons/ems/efiafa---------.svg | 28 +- milstd2525/icons/ems/efiag----------.svg | 28 +- milstd2525/icons/ems/efiaga---------.svg | 28 +- milstd2525/icons/ems/efiagb---------.svg | 28 +- milstd2525/icons/ems/efiah----------.svg | 28 +- milstd2525/icons/ems/efiaha---------.svg | 28 +- milstd2525/icons/ems/efipa----------.svg | 28 +- milstd2525/icons/ems/efipac---------.svg | 28 +- milstd2525/icons/ems/efipb----------.svg | 28 +- milstd2525/icons/ems/efipba---------.svg | 28 +- milstd2525/icons/ems/efipbc---------.svg | 28 +- milstd2525/icons/ems/efipbd---------.svg | 28 +- milstd2525/icons/ems/efipbf---------.svg | 28 +- milstd2525/icons/ems/efipc----------.svg | 28 +- milstd2525/icons/ems/efipca---------.svg | 28 +- milstd2525/icons/ems/efipcb---------.svg | 28 +- milstd2525/icons/ems/efipcc---------.svg | 28 +- milstd2525/icons/ems/efipcd---------.svg | 28 +- milstd2525/icons/ems/efipce---------.svg | 28 +- milstd2525/icons/ems/efipcf---------.svg | 28 +- milstd2525/icons/ems/efipcg---------.svg | 28 +- milstd2525/icons/ems/efipch---------.svg | 28 +- milstd2525/icons/ems/efipd----------.svg | 28 +- milstd2525/icons/ems/efipda---------.svg | 28 +- milstd2525/icons/ems/efipdb---------.svg | 28 +- milstd2525/icons/ems/efipdc---------.svg | 28 +- milstd2525/icons/ems/efipdd---------.svg | 28 +- milstd2525/icons/ems/efipde---------.svg | 28 +- milstd2525/icons/ems/efipdf---------.svg | 28 +- milstd2525/icons/ems/efipdg---------.svg | 28 +- milstd2525/icons/ems/efipdh---------.svg | 28 +- milstd2525/icons/ems/efipdi---------.svg | 28 +- milstd2525/icons/ems/efipdj---------.svg | 28 +- milstd2525/icons/ems/efipdk---------.svg | 28 +- milstd2525/icons/ems/efipdl---------.svg | 28 +- milstd2525/icons/ems/efipdm---------.svg | 28 +- milstd2525/icons/ems/efipdn---------.svg | 28 +- milstd2525/icons/ems/efipdo---------.svg | 28 +- milstd2525/icons/ems/efipe----------.svg | 28 +- milstd2525/icons/ems/efipea---------.svg | 28 +- milstd2525/icons/ems/efipf----------.svg | 28 +- milstd2525/icons/ems/efipfa---------.svg | 28 +- milstd2525/icons/ems/efipg----------.svg | 28 +- milstd2525/icons/ems/efipga---------.svg | 28 +- milstd2525/icons/ems/efipgb---------.svg | 28 +- milstd2525/icons/ems/efiph----------.svg | 28 +- milstd2525/icons/ems/efipha---------.svg | 28 +- milstd2525/icons/ems/efoaa----------.svg | 28 +- milstd2525/icons/ems/efoaaa---------.svg | 28 +- milstd2525/icons/ems/efoaab---------.svg | 28 +- milstd2525/icons/ems/efoaac---------.svg | 28 +- milstd2525/icons/ems/efoaad---------.svg | 28 +- milstd2525/icons/ems/efoaae---------.svg | 28 +- milstd2525/icons/ems/efoaaf---------.svg | 28 +- milstd2525/icons/ems/efoaag---------.svg | 28 +- milstd2525/icons/ems/efoaaj---------.svg | 28 +- milstd2525/icons/ems/efoaak---------.svg | 28 +- milstd2525/icons/ems/efoaal---------.svg | 28 +- milstd2525/icons/ems/efoaam---------.svg | 28 +- milstd2525/icons/ems/efoab----------.svg | 28 +- milstd2525/icons/ems/efoaba---------.svg | 28 +- milstd2525/icons/ems/efoabb---------.svg | 28 +- milstd2525/icons/ems/efoabc---------.svg | 28 +- milstd2525/icons/ems/efoabd---------.svg | 28 +- milstd2525/icons/ems/efoabe---------.svg | 28 +- milstd2525/icons/ems/efoabf---------.svg | 28 +- milstd2525/icons/ems/efoabg---------.svg | 28 +- milstd2525/icons/ems/efoabh---------.svg | 28 +- milstd2525/icons/ems/efoabi---------.svg | 28 +- milstd2525/icons/ems/efoabj---------.svg | 28 +- milstd2525/icons/ems/efoabk---------.svg | 28 +- milstd2525/icons/ems/efoabl---------.svg | 28 +- milstd2525/icons/ems/efoac----------.svg | 28 +- milstd2525/icons/ems/efoaca---------.svg | 28 +- milstd2525/icons/ems/efoacb---------.svg | 28 +- milstd2525/icons/ems/efoacc---------.svg | 28 +- milstd2525/icons/ems/efoacd---------.svg | 28 +- milstd2525/icons/ems/efoace---------.svg | 28 +- milstd2525/icons/ems/efoad----------.svg | 28 +- milstd2525/icons/ems/efoada---------.svg | 28 +- milstd2525/icons/ems/efoadb---------.svg | 28 +- milstd2525/icons/ems/efoadc---------.svg | 28 +- milstd2525/icons/ems/efoadd---------.svg | 28 +- milstd2525/icons/ems/efoadda--------.svg | 28 +- milstd2525/icons/ems/efoaddb--------.svg | 28 +- milstd2525/icons/ems/efoaddc--------.svg | 28 +- milstd2525/icons/ems/efoade---------.svg | 28 +- milstd2525/icons/ems/efoadea--------.svg | 28 +- milstd2525/icons/ems/efoadeb--------.svg | 28 +- milstd2525/icons/ems/efoadec--------.svg | 28 +- milstd2525/icons/ems/efoadf---------.svg | 28 +- milstd2525/icons/ems/efoadfa--------.svg | 28 +- milstd2525/icons/ems/efoadfb--------.svg | 28 +- milstd2525/icons/ems/efoadfc--------.svg | 28 +- milstd2525/icons/ems/efoadg---------.svg | 28 +- milstd2525/icons/ems/efoadga--------.svg | 28 +- milstd2525/icons/ems/efoadgb--------.svg | 28 +- milstd2525/icons/ems/efoadgc--------.svg | 28 +- milstd2525/icons/ems/efoadh---------.svg | 28 +- milstd2525/icons/ems/efoadha--------.svg | 28 +- milstd2525/icons/ems/efoadhb--------.svg | 28 +- milstd2525/icons/ems/efoadhc--------.svg | 28 +- milstd2525/icons/ems/efoadi---------.svg | 28 +- milstd2525/icons/ems/efoadia--------.svg | 28 +- milstd2525/icons/ems/efoadib--------.svg | 28 +- milstd2525/icons/ems/efoadic--------.svg | 28 +- milstd2525/icons/ems/efoadj---------.svg | 28 +- milstd2525/icons/ems/efoadjb--------.svg | 28 +- milstd2525/icons/ems/efoadjc--------.svg | 28 +- milstd2525/icons/ems/efoadk---------.svg | 28 +- milstd2525/icons/ems/efoadl---------.svg | 28 +- milstd2525/icons/ems/efoadla--------.svg | 28 +- milstd2525/icons/ems/efoadlb--------.svg | 28 +- milstd2525/icons/ems/efoadlc--------.svg | 28 +- milstd2525/icons/ems/efoadm---------.svg | 28 +- milstd2525/icons/ems/efoadma--------.svg | 28 +- milstd2525/icons/ems/efoadmb--------.svg | 28 +- milstd2525/icons/ems/efoadmc--------.svg | 28 +- milstd2525/icons/ems/efoadn---------.svg | 28 +- milstd2525/icons/ems/efoadna--------.svg | 28 +- milstd2525/icons/ems/efoadnc--------.svg | 28 +- milstd2525/icons/ems/efoado---------.svg | 28 +- milstd2525/icons/ems/efoadoa--------.svg | 28 +- milstd2525/icons/ems/efoadob--------.svg | 28 +- milstd2525/icons/ems/efoadoc--------.svg | 28 +- milstd2525/icons/ems/efoaea---------.svg | 28 +- milstd2525/icons/ems/efoaeb---------.svg | 28 +- milstd2525/icons/ems/efoaec---------.svg | 28 +- milstd2525/icons/ems/efoaed---------.svg | 28 +- milstd2525/icons/ems/efoaee---------.svg | 28 +- milstd2525/icons/ems/efopa----------.svg | 28 +- milstd2525/icons/ems/efopaa---------.svg | 28 +- milstd2525/icons/ems/efopab---------.svg | 28 +- milstd2525/icons/ems/efopac---------.svg | 28 +- milstd2525/icons/ems/efopad---------.svg | 28 +- milstd2525/icons/ems/efopae---------.svg | 28 +- milstd2525/icons/ems/efopaf---------.svg | 28 +- milstd2525/icons/ems/efopag---------.svg | 28 +- milstd2525/icons/ems/efopaj---------.svg | 28 +- milstd2525/icons/ems/efopak---------.svg | 28 +- milstd2525/icons/ems/efopal---------.svg | 28 +- milstd2525/icons/ems/efopam---------.svg | 28 +- milstd2525/icons/ems/efopb----------.svg | 28 +- milstd2525/icons/ems/efopba---------.svg | 28 +- milstd2525/icons/ems/efopbb---------.svg | 28 +- milstd2525/icons/ems/efopbc---------.svg | 28 +- milstd2525/icons/ems/efopbd---------.svg | 28 +- milstd2525/icons/ems/efopbe---------.svg | 28 +- milstd2525/icons/ems/efopbf---------.svg | 28 +- milstd2525/icons/ems/efopbg---------.svg | 28 +- milstd2525/icons/ems/efopbh---------.svg | 28 +- milstd2525/icons/ems/efopbi---------.svg | 28 +- milstd2525/icons/ems/efopbj---------.svg | 28 +- milstd2525/icons/ems/efopbk---------.svg | 28 +- milstd2525/icons/ems/efopbl---------.svg | 28 +- milstd2525/icons/ems/efopc----------.svg | 28 +- milstd2525/icons/ems/efopca---------.svg | 28 +- milstd2525/icons/ems/efopcb---------.svg | 28 +- milstd2525/icons/ems/efopcc---------.svg | 28 +- milstd2525/icons/ems/efopcd---------.svg | 28 +- milstd2525/icons/ems/efopce---------.svg | 28 +- milstd2525/icons/ems/efopd----------.svg | 28 +- milstd2525/icons/ems/efopda---------.svg | 28 +- milstd2525/icons/ems/efopdb---------.svg | 28 +- milstd2525/icons/ems/efopdc---------.svg | 28 +- milstd2525/icons/ems/efopdd---------.svg | 28 +- milstd2525/icons/ems/efopdda--------.svg | 28 +- milstd2525/icons/ems/efopddb--------.svg | 28 +- milstd2525/icons/ems/efopddc--------.svg | 28 +- milstd2525/icons/ems/efopde---------.svg | 28 +- milstd2525/icons/ems/efopdea--------.svg | 28 +- milstd2525/icons/ems/efopdeb--------.svg | 28 +- milstd2525/icons/ems/efopdec--------.svg | 28 +- milstd2525/icons/ems/efopdf---------.svg | 28 +- milstd2525/icons/ems/efopdfa--------.svg | 28 +- milstd2525/icons/ems/efopdfb--------.svg | 28 +- milstd2525/icons/ems/efopdfc--------.svg | 28 +- milstd2525/icons/ems/efopdg---------.svg | 28 +- milstd2525/icons/ems/efopdga--------.svg | 28 +- milstd2525/icons/ems/efopdgb--------.svg | 28 +- milstd2525/icons/ems/efopdgc--------.svg | 28 +- milstd2525/icons/ems/efopdh---------.svg | 28 +- milstd2525/icons/ems/efopdha--------.svg | 28 +- milstd2525/icons/ems/efopdhb--------.svg | 28 +- milstd2525/icons/ems/efopdhc--------.svg | 28 +- milstd2525/icons/ems/efopdi---------.svg | 28 +- milstd2525/icons/ems/efopdia--------.svg | 28 +- milstd2525/icons/ems/efopdib--------.svg | 28 +- milstd2525/icons/ems/efopdic--------.svg | 28 +- milstd2525/icons/ems/efopdj---------.svg | 28 +- milstd2525/icons/ems/efopdjb--------.svg | 28 +- milstd2525/icons/ems/efopdjc--------.svg | 28 +- milstd2525/icons/ems/efopdk---------.svg | 28 +- milstd2525/icons/ems/efopdl---------.svg | 28 +- milstd2525/icons/ems/efopdla--------.svg | 28 +- milstd2525/icons/ems/efopdlb--------.svg | 28 +- milstd2525/icons/ems/efopdlc--------.svg | 28 +- milstd2525/icons/ems/efopdm---------.svg | 28 +- milstd2525/icons/ems/efopdma--------.svg | 28 +- milstd2525/icons/ems/efopdmb--------.svg | 28 +- milstd2525/icons/ems/efopdmc--------.svg | 28 +- milstd2525/icons/ems/efopdn---------.svg | 28 +- milstd2525/icons/ems/efopdna--------.svg | 28 +- milstd2525/icons/ems/efopdnc--------.svg | 28 +- milstd2525/icons/ems/efopdo---------.svg | 28 +- milstd2525/icons/ems/efopdoa--------.svg | 28 +- milstd2525/icons/ems/efopdob--------.svg | 28 +- milstd2525/icons/ems/efopdoc--------.svg | 28 +- milstd2525/icons/ems/efopea---------.svg | 28 +- milstd2525/icons/ems/efopeb---------.svg | 28 +- milstd2525/icons/ems/efopec---------.svg | 28 +- milstd2525/icons/ems/efoped---------.svg | 28 +- milstd2525/icons/ems/efopee---------.svg | 28 +- milstd2525/icons/ems/ehfaa----------.svg | 28 +- milstd2525/icons/ems/ehfaaa---------.svg | 28 +- milstd2525/icons/ems/ehfaab---------.svg | 28 +- milstd2525/icons/ems/ehfaac---------.svg | 28 +- milstd2525/icons/ems/ehfaad---------.svg | 28 +- milstd2525/icons/ems/ehfaae---------.svg | 28 +- milstd2525/icons/ems/ehfaaf---------.svg | 28 +- milstd2525/icons/ems/ehfaag---------.svg | 28 +- milstd2525/icons/ems/ehfab----------.svg | 28 +- milstd2525/icons/ems/ehfaba---------.svg | 28 +- milstd2525/icons/ems/ehfabb---------.svg | 28 +- milstd2525/icons/ems/ehfabc---------.svg | 28 +- milstd2525/icons/ems/ehfabd---------.svg | 28 +- milstd2525/icons/ems/ehfabe---------.svg | 28 +- milstd2525/icons/ems/ehfabf---------.svg | 28 +- milstd2525/icons/ems/ehfac----------.svg | 28 +- milstd2525/icons/ems/ehfaca---------.svg | 28 +- milstd2525/icons/ems/ehfacb---------.svg | 28 +- milstd2525/icons/ems/ehfacc---------.svg | 28 +- milstd2525/icons/ems/ehfacd---------.svg | 28 +- milstd2525/icons/ems/ehface---------.svg | 28 +- milstd2525/icons/ems/ehfacf---------.svg | 28 +- milstd2525/icons/ems/ehfacg---------.svg | 28 +- milstd2525/icons/ems/ehfach---------.svg | 28 +- milstd2525/icons/ems/ehfaci---------.svg | 28 +- milstd2525/icons/ems/ehfacj---------.svg | 28 +- milstd2525/icons/ems/ehfad----------.svg | 28 +- milstd2525/icons/ems/ehfada---------.svg | 28 +- milstd2525/icons/ems/ehfadb---------.svg | 28 +- milstd2525/icons/ems/ehfaea---------.svg | 28 +- milstd2525/icons/ems/ehfaeb---------.svg | 28 +- milstd2525/icons/ems/ehfaee---------.svg | 28 +- milstd2525/icons/ems/ehfaf----------.svg | 28 +- milstd2525/icons/ems/ehfag----------.svg | 28 +- milstd2525/icons/ems/ehfaga---------.svg | 28 +- milstd2525/icons/ems/ehfah----------.svg | 28 +- milstd2525/icons/ems/ehfaha---------.svg | 28 +- milstd2525/icons/ems/ehfahb---------.svg | 28 +- milstd2525/icons/ems/ehfai----------.svg | 28 +- milstd2525/icons/ems/ehfaia---------.svg | 28 +- milstd2525/icons/ems/ehfaib---------.svg | 28 +- milstd2525/icons/ems/ehfaic---------.svg | 28 +- milstd2525/icons/ems/ehfaid---------.svg | 28 +- milstd2525/icons/ems/ehfaj----------.svg | 28 +- milstd2525/icons/ems/ehfaja---------.svg | 28 +- milstd2525/icons/ems/ehfajb---------.svg | 28 +- milstd2525/icons/ems/ehfajc---------.svg | 28 +- milstd2525/icons/ems/ehfak----------.svg | 28 +- milstd2525/icons/ems/ehfakb---------.svg | 28 +- milstd2525/icons/ems/ehfala---------.svg | 28 +- milstd2525/icons/ems/ehfald---------.svg | 28 +- milstd2525/icons/ems/ehfale---------.svg | 28 +- milstd2525/icons/ems/ehfalf---------.svg | 28 +- milstd2525/icons/ems/ehfalh---------.svg | 28 +- milstd2525/icons/ems/ehfalj---------.svg | 28 +- milstd2525/icons/ems/ehfalk---------.svg | 28 +- milstd2525/icons/ems/ehfalm---------.svg | 28 +- milstd2525/icons/ems/ehfalo---------.svg | 28 +- milstd2525/icons/ems/ehfalp---------.svg | 28 +- milstd2525/icons/ems/ehfama---------.svg | 28 +- milstd2525/icons/ems/ehfamb---------.svg | 28 +- milstd2525/icons/ems/ehfamc---------.svg | 28 +- milstd2525/icons/ems/ehfamd---------.svg | 28 +- milstd2525/icons/ems/ehfame---------.svg | 28 +- milstd2525/icons/ems/ehfamf---------.svg | 28 +- milstd2525/icons/ems/ehfamg---------.svg | 28 +- milstd2525/icons/ems/ehfamh---------.svg | 28 +- milstd2525/icons/ems/ehfami---------.svg | 28 +- milstd2525/icons/ems/ehfpa----------.svg | 28 +- milstd2525/icons/ems/ehfpaa---------.svg | 28 +- milstd2525/icons/ems/ehfpab---------.svg | 28 +- milstd2525/icons/ems/ehfpac---------.svg | 28 +- milstd2525/icons/ems/ehfpad---------.svg | 28 +- milstd2525/icons/ems/ehfpae---------.svg | 28 +- milstd2525/icons/ems/ehfpaf---------.svg | 28 +- milstd2525/icons/ems/ehfpag---------.svg | 28 +- milstd2525/icons/ems/ehfpb----------.svg | 28 +- milstd2525/icons/ems/ehfpba---------.svg | 28 +- milstd2525/icons/ems/ehfpbb---------.svg | 28 +- milstd2525/icons/ems/ehfpbc---------.svg | 28 +- milstd2525/icons/ems/ehfpbd---------.svg | 28 +- milstd2525/icons/ems/ehfpbe---------.svg | 28 +- milstd2525/icons/ems/ehfpbf---------.svg | 28 +- milstd2525/icons/ems/ehfpc----------.svg | 28 +- milstd2525/icons/ems/ehfpca---------.svg | 28 +- milstd2525/icons/ems/ehfpcb---------.svg | 28 +- milstd2525/icons/ems/ehfpcc---------.svg | 28 +- milstd2525/icons/ems/ehfpcd---------.svg | 28 +- milstd2525/icons/ems/ehfpce---------.svg | 28 +- milstd2525/icons/ems/ehfpcf---------.svg | 28 +- milstd2525/icons/ems/ehfpcg---------.svg | 28 +- milstd2525/icons/ems/ehfpch---------.svg | 28 +- milstd2525/icons/ems/ehfpci---------.svg | 28 +- milstd2525/icons/ems/ehfpcj---------.svg | 28 +- milstd2525/icons/ems/ehfpd----------.svg | 28 +- milstd2525/icons/ems/ehfpda---------.svg | 28 +- milstd2525/icons/ems/ehfpdb---------.svg | 28 +- milstd2525/icons/ems/ehfpea---------.svg | 28 +- milstd2525/icons/ems/ehfpeb---------.svg | 28 +- milstd2525/icons/ems/ehfpee---------.svg | 28 +- milstd2525/icons/ems/ehfpf----------.svg | 28 +- milstd2525/icons/ems/ehfpg----------.svg | 28 +- milstd2525/icons/ems/ehfpga---------.svg | 28 +- milstd2525/icons/ems/ehfph----------.svg | 28 +- milstd2525/icons/ems/ehfpha---------.svg | 28 +- milstd2525/icons/ems/ehfphb---------.svg | 28 +- milstd2525/icons/ems/ehfpi----------.svg | 28 +- milstd2525/icons/ems/ehfpia---------.svg | 28 +- milstd2525/icons/ems/ehfpib---------.svg | 28 +- milstd2525/icons/ems/ehfpic---------.svg | 28 +- milstd2525/icons/ems/ehfpid---------.svg | 28 +- milstd2525/icons/ems/ehfpj----------.svg | 28 +- milstd2525/icons/ems/ehfpja---------.svg | 28 +- milstd2525/icons/ems/ehfpjb---------.svg | 28 +- milstd2525/icons/ems/ehfpjc---------.svg | 28 +- milstd2525/icons/ems/ehfpk----------.svg | 28 +- milstd2525/icons/ems/ehfpkb---------.svg | 28 +- milstd2525/icons/ems/ehfpla---------.svg | 28 +- milstd2525/icons/ems/ehfpld---------.svg | 28 +- milstd2525/icons/ems/ehfple---------.svg | 28 +- milstd2525/icons/ems/ehfplf---------.svg | 28 +- milstd2525/icons/ems/ehfplh---------.svg | 28 +- milstd2525/icons/ems/ehfplj---------.svg | 28 +- milstd2525/icons/ems/ehfplk---------.svg | 28 +- milstd2525/icons/ems/ehfplm---------.svg | 28 +- milstd2525/icons/ems/ehfplo---------.svg | 28 +- milstd2525/icons/ems/ehfplp---------.svg | 28 +- milstd2525/icons/ems/ehfpma---------.svg | 28 +- milstd2525/icons/ems/ehfpmb---------.svg | 28 +- milstd2525/icons/ems/ehfpmc---------.svg | 28 +- milstd2525/icons/ems/ehfpmd---------.svg | 28 +- milstd2525/icons/ems/ehfpme---------.svg | 28 +- milstd2525/icons/ems/ehfpmf---------.svg | 28 +- milstd2525/icons/ems/ehfpmg---------.svg | 28 +- milstd2525/icons/ems/ehfpmh---------.svg | 28 +- milstd2525/icons/ems/ehfpmi---------.svg | 28 +- milstd2525/icons/ems/ehiaa----------.svg | 28 +- milstd2525/icons/ems/ehiaac---------.svg | 28 +- milstd2525/icons/ems/ehiab----------.svg | 28 +- milstd2525/icons/ems/ehiaba---------.svg | 28 +- milstd2525/icons/ems/ehiabc---------.svg | 28 +- milstd2525/icons/ems/ehiabd---------.svg | 28 +- milstd2525/icons/ems/ehiabf---------.svg | 28 +- milstd2525/icons/ems/ehiac----------.svg | 28 +- milstd2525/icons/ems/ehiaca---------.svg | 28 +- milstd2525/icons/ems/ehiacb---------.svg | 28 +- milstd2525/icons/ems/ehiacc---------.svg | 28 +- milstd2525/icons/ems/ehiacd---------.svg | 28 +- milstd2525/icons/ems/ehiace---------.svg | 28 +- milstd2525/icons/ems/ehiacf---------.svg | 28 +- milstd2525/icons/ems/ehiacg---------.svg | 28 +- milstd2525/icons/ems/ehiach---------.svg | 28 +- milstd2525/icons/ems/ehiad----------.svg | 28 +- milstd2525/icons/ems/ehiada---------.svg | 28 +- milstd2525/icons/ems/ehiadb---------.svg | 28 +- milstd2525/icons/ems/ehiadc---------.svg | 28 +- milstd2525/icons/ems/ehiadd---------.svg | 28 +- milstd2525/icons/ems/ehiade---------.svg | 28 +- milstd2525/icons/ems/ehiadf---------.svg | 28 +- milstd2525/icons/ems/ehiadg---------.svg | 28 +- milstd2525/icons/ems/ehiadh---------.svg | 28 +- milstd2525/icons/ems/ehiadi---------.svg | 28 +- milstd2525/icons/ems/ehiadj---------.svg | 28 +- milstd2525/icons/ems/ehiadk---------.svg | 28 +- milstd2525/icons/ems/ehiadl---------.svg | 28 +- milstd2525/icons/ems/ehiadm---------.svg | 28 +- milstd2525/icons/ems/ehiadn---------.svg | 28 +- milstd2525/icons/ems/ehiado---------.svg | 28 +- milstd2525/icons/ems/ehiae----------.svg | 28 +- milstd2525/icons/ems/ehiaea---------.svg | 28 +- milstd2525/icons/ems/ehiaf----------.svg | 28 +- milstd2525/icons/ems/ehiafa---------.svg | 28 +- milstd2525/icons/ems/ehiag----------.svg | 28 +- milstd2525/icons/ems/ehiaga---------.svg | 28 +- milstd2525/icons/ems/ehiagb---------.svg | 28 +- milstd2525/icons/ems/ehiah----------.svg | 28 +- milstd2525/icons/ems/ehiaha---------.svg | 28 +- milstd2525/icons/ems/ehipa----------.svg | 28 +- milstd2525/icons/ems/ehipac---------.svg | 28 +- milstd2525/icons/ems/ehipb----------.svg | 28 +- milstd2525/icons/ems/ehipba---------.svg | 28 +- milstd2525/icons/ems/ehipbc---------.svg | 28 +- milstd2525/icons/ems/ehipbd---------.svg | 28 +- milstd2525/icons/ems/ehipbf---------.svg | 28 +- milstd2525/icons/ems/ehipc----------.svg | 28 +- milstd2525/icons/ems/ehipca---------.svg | 28 +- milstd2525/icons/ems/ehipcb---------.svg | 28 +- milstd2525/icons/ems/ehipcc---------.svg | 28 +- milstd2525/icons/ems/ehipcd---------.svg | 28 +- milstd2525/icons/ems/ehipce---------.svg | 28 +- milstd2525/icons/ems/ehipcf---------.svg | 28 +- milstd2525/icons/ems/ehipcg---------.svg | 28 +- milstd2525/icons/ems/ehipch---------.svg | 28 +- milstd2525/icons/ems/ehipd----------.svg | 28 +- milstd2525/icons/ems/ehipda---------.svg | 28 +- milstd2525/icons/ems/ehipdb---------.svg | 28 +- milstd2525/icons/ems/ehipdc---------.svg | 28 +- milstd2525/icons/ems/ehipdd---------.svg | 28 +- milstd2525/icons/ems/ehipde---------.svg | 28 +- milstd2525/icons/ems/ehipdf---------.svg | 28 +- milstd2525/icons/ems/ehipdg---------.svg | 28 +- milstd2525/icons/ems/ehipdh---------.svg | 28 +- milstd2525/icons/ems/ehipdi---------.svg | 28 +- milstd2525/icons/ems/ehipdj---------.svg | 28 +- milstd2525/icons/ems/ehipdk---------.svg | 28 +- milstd2525/icons/ems/ehipdl---------.svg | 28 +- milstd2525/icons/ems/ehipdm---------.svg | 28 +- milstd2525/icons/ems/ehipdn---------.svg | 28 +- milstd2525/icons/ems/ehipdo---------.svg | 28 +- milstd2525/icons/ems/ehipe----------.svg | 28 +- milstd2525/icons/ems/ehipea---------.svg | 28 +- milstd2525/icons/ems/ehipf----------.svg | 28 +- milstd2525/icons/ems/ehipfa---------.svg | 28 +- milstd2525/icons/ems/ehipg----------.svg | 28 +- milstd2525/icons/ems/ehipga---------.svg | 28 +- milstd2525/icons/ems/ehipgb---------.svg | 28 +- milstd2525/icons/ems/ehiph----------.svg | 28 +- milstd2525/icons/ems/ehipha---------.svg | 28 +- milstd2525/icons/ems/ehoaa----------.svg | 28 +- milstd2525/icons/ems/ehoaaa---------.svg | 28 +- milstd2525/icons/ems/ehoaab---------.svg | 28 +- milstd2525/icons/ems/ehoaac---------.svg | 28 +- milstd2525/icons/ems/ehoaad---------.svg | 28 +- milstd2525/icons/ems/ehoaae---------.svg | 28 +- milstd2525/icons/ems/ehoaaf---------.svg | 28 +- milstd2525/icons/ems/ehoaag---------.svg | 28 +- milstd2525/icons/ems/ehoaaj---------.svg | 28 +- milstd2525/icons/ems/ehoaak---------.svg | 28 +- milstd2525/icons/ems/ehoaal---------.svg | 28 +- milstd2525/icons/ems/ehoaam---------.svg | 28 +- milstd2525/icons/ems/ehoab----------.svg | 28 +- milstd2525/icons/ems/ehoaba---------.svg | 28 +- milstd2525/icons/ems/ehoabb---------.svg | 28 +- milstd2525/icons/ems/ehoabc---------.svg | 28 +- milstd2525/icons/ems/ehoabd---------.svg | 28 +- milstd2525/icons/ems/ehoabe---------.svg | 28 +- milstd2525/icons/ems/ehoabf---------.svg | 28 +- milstd2525/icons/ems/ehoabg---------.svg | 28 +- milstd2525/icons/ems/ehoabh---------.svg | 28 +- milstd2525/icons/ems/ehoabi---------.svg | 28 +- milstd2525/icons/ems/ehoabj---------.svg | 28 +- milstd2525/icons/ems/ehoabk---------.svg | 28 +- milstd2525/icons/ems/ehoabl---------.svg | 28 +- milstd2525/icons/ems/ehoac----------.svg | 28 +- milstd2525/icons/ems/ehoaca---------.svg | 28 +- milstd2525/icons/ems/ehoacb---------.svg | 28 +- milstd2525/icons/ems/ehoacc---------.svg | 28 +- milstd2525/icons/ems/ehoacd---------.svg | 28 +- milstd2525/icons/ems/ehoace---------.svg | 28 +- milstd2525/icons/ems/ehoad----------.svg | 28 +- milstd2525/icons/ems/ehoada---------.svg | 28 +- milstd2525/icons/ems/ehoadb---------.svg | 28 +- milstd2525/icons/ems/ehoadc---------.svg | 28 +- milstd2525/icons/ems/ehoadd---------.svg | 28 +- milstd2525/icons/ems/ehoadda--------.svg | 28 +- milstd2525/icons/ems/ehoaddb--------.svg | 28 +- milstd2525/icons/ems/ehoaddc--------.svg | 28 +- milstd2525/icons/ems/ehoade---------.svg | 28 +- milstd2525/icons/ems/ehoadea--------.svg | 28 +- milstd2525/icons/ems/ehoadeb--------.svg | 28 +- milstd2525/icons/ems/ehoadec--------.svg | 28 +- milstd2525/icons/ems/ehoadf---------.svg | 28 +- milstd2525/icons/ems/ehoadfa--------.svg | 28 +- milstd2525/icons/ems/ehoadfb--------.svg | 28 +- milstd2525/icons/ems/ehoadfc--------.svg | 28 +- milstd2525/icons/ems/ehoadg---------.svg | 28 +- milstd2525/icons/ems/ehoadga--------.svg | 28 +- milstd2525/icons/ems/ehoadgb--------.svg | 28 +- milstd2525/icons/ems/ehoadgc--------.svg | 28 +- milstd2525/icons/ems/ehoadh---------.svg | 28 +- milstd2525/icons/ems/ehoadha--------.svg | 28 +- milstd2525/icons/ems/ehoadhb--------.svg | 28 +- milstd2525/icons/ems/ehoadhc--------.svg | 28 +- milstd2525/icons/ems/ehoadi---------.svg | 28 +- milstd2525/icons/ems/ehoadia--------.svg | 28 +- milstd2525/icons/ems/ehoadib--------.svg | 28 +- milstd2525/icons/ems/ehoadic--------.svg | 28 +- milstd2525/icons/ems/ehoadj---------.svg | 28 +- milstd2525/icons/ems/ehoadjb--------.svg | 28 +- milstd2525/icons/ems/ehoadjc--------.svg | 28 +- milstd2525/icons/ems/ehoadk---------.svg | 28 +- milstd2525/icons/ems/ehoadl---------.svg | 28 +- milstd2525/icons/ems/ehoadla--------.svg | 28 +- milstd2525/icons/ems/ehoadlb--------.svg | 28 +- milstd2525/icons/ems/ehoadlc--------.svg | 28 +- milstd2525/icons/ems/ehoadm---------.svg | 28 +- milstd2525/icons/ems/ehoadma--------.svg | 28 +- milstd2525/icons/ems/ehoadmb--------.svg | 28 +- milstd2525/icons/ems/ehoadmc--------.svg | 28 +- milstd2525/icons/ems/ehoadn---------.svg | 28 +- milstd2525/icons/ems/ehoadna--------.svg | 28 +- milstd2525/icons/ems/ehoadnc--------.svg | 28 +- milstd2525/icons/ems/ehoado---------.svg | 28 +- milstd2525/icons/ems/ehoadoa--------.svg | 28 +- milstd2525/icons/ems/ehoadob--------.svg | 28 +- milstd2525/icons/ems/ehoadoc--------.svg | 28 +- milstd2525/icons/ems/ehoaea---------.svg | 28 +- milstd2525/icons/ems/ehoaeb---------.svg | 28 +- milstd2525/icons/ems/ehoaec---------.svg | 28 +- milstd2525/icons/ems/ehoaed---------.svg | 28 +- milstd2525/icons/ems/ehoaee---------.svg | 28 +- milstd2525/icons/ems/ehopa----------.svg | 28 +- milstd2525/icons/ems/ehopaa---------.svg | 28 +- milstd2525/icons/ems/ehopab---------.svg | 28 +- milstd2525/icons/ems/ehopac---------.svg | 28 +- milstd2525/icons/ems/ehopad---------.svg | 28 +- milstd2525/icons/ems/ehopae---------.svg | 28 +- milstd2525/icons/ems/ehopaf---------.svg | 28 +- milstd2525/icons/ems/ehopag---------.svg | 28 +- milstd2525/icons/ems/ehopaj---------.svg | 28 +- milstd2525/icons/ems/ehopak---------.svg | 28 +- milstd2525/icons/ems/ehopal---------.svg | 28 +- milstd2525/icons/ems/ehopam---------.svg | 28 +- milstd2525/icons/ems/ehopb----------.svg | 28 +- milstd2525/icons/ems/ehopba---------.svg | 28 +- milstd2525/icons/ems/ehopbb---------.svg | 28 +- milstd2525/icons/ems/ehopbc---------.svg | 28 +- milstd2525/icons/ems/ehopbd---------.svg | 28 +- milstd2525/icons/ems/ehopbe---------.svg | 28 +- milstd2525/icons/ems/ehopbf---------.svg | 28 +- milstd2525/icons/ems/ehopbg---------.svg | 28 +- milstd2525/icons/ems/ehopbh---------.svg | 28 +- milstd2525/icons/ems/ehopbi---------.svg | 28 +- milstd2525/icons/ems/ehopbj---------.svg | 28 +- milstd2525/icons/ems/ehopbk---------.svg | 28 +- milstd2525/icons/ems/ehopbl---------.svg | 28 +- milstd2525/icons/ems/ehopc----------.svg | 28 +- milstd2525/icons/ems/ehopca---------.svg | 28 +- milstd2525/icons/ems/ehopcb---------.svg | 28 +- milstd2525/icons/ems/ehopcc---------.svg | 28 +- milstd2525/icons/ems/ehopcd---------.svg | 28 +- milstd2525/icons/ems/ehopce---------.svg | 28 +- milstd2525/icons/ems/ehopd----------.svg | 28 +- milstd2525/icons/ems/ehopda---------.svg | 28 +- milstd2525/icons/ems/ehopdb---------.svg | 28 +- milstd2525/icons/ems/ehopdc---------.svg | 28 +- milstd2525/icons/ems/ehopdd---------.svg | 28 +- milstd2525/icons/ems/ehopdda--------.svg | 28 +- milstd2525/icons/ems/ehopddb--------.svg | 28 +- milstd2525/icons/ems/ehopddc--------.svg | 28 +- milstd2525/icons/ems/ehopde---------.svg | 28 +- milstd2525/icons/ems/ehopdea--------.svg | 28 +- milstd2525/icons/ems/ehopdeb--------.svg | 28 +- milstd2525/icons/ems/ehopdec--------.svg | 28 +- milstd2525/icons/ems/ehopdf---------.svg | 28 +- milstd2525/icons/ems/ehopdfa--------.svg | 28 +- milstd2525/icons/ems/ehopdfb--------.svg | 28 +- milstd2525/icons/ems/ehopdfc--------.svg | 28 +- milstd2525/icons/ems/ehopdg---------.svg | 28 +- milstd2525/icons/ems/ehopdga--------.svg | 28 +- milstd2525/icons/ems/ehopdgb--------.svg | 28 +- milstd2525/icons/ems/ehopdgc--------.svg | 28 +- milstd2525/icons/ems/ehopdh---------.svg | 28 +- milstd2525/icons/ems/ehopdha--------.svg | 28 +- milstd2525/icons/ems/ehopdhb--------.svg | 28 +- milstd2525/icons/ems/ehopdhc--------.svg | 28 +- milstd2525/icons/ems/ehopdi---------.svg | 28 +- milstd2525/icons/ems/ehopdia--------.svg | 28 +- milstd2525/icons/ems/ehopdib--------.svg | 28 +- milstd2525/icons/ems/ehopdic--------.svg | 28 +- milstd2525/icons/ems/ehopdj---------.svg | 28 +- milstd2525/icons/ems/ehopdjb--------.svg | 28 +- milstd2525/icons/ems/ehopdjc--------.svg | 28 +- milstd2525/icons/ems/ehopdk---------.svg | 28 +- milstd2525/icons/ems/ehopdl---------.svg | 28 +- milstd2525/icons/ems/ehopdla--------.svg | 28 +- milstd2525/icons/ems/ehopdlb--------.svg | 28 +- milstd2525/icons/ems/ehopdlc--------.svg | 28 +- milstd2525/icons/ems/ehopdm---------.svg | 28 +- milstd2525/icons/ems/ehopdma--------.svg | 28 +- milstd2525/icons/ems/ehopdmb--------.svg | 28 +- milstd2525/icons/ems/ehopdmc--------.svg | 28 +- milstd2525/icons/ems/ehopdn---------.svg | 28 +- milstd2525/icons/ems/ehopdna--------.svg | 28 +- milstd2525/icons/ems/ehopdnc--------.svg | 28 +- milstd2525/icons/ems/ehopdo---------.svg | 28 +- milstd2525/icons/ems/ehopdoa--------.svg | 28 +- milstd2525/icons/ems/ehopdob--------.svg | 28 +- milstd2525/icons/ems/ehopdoc--------.svg | 28 +- milstd2525/icons/ems/ehopea---------.svg | 28 +- milstd2525/icons/ems/ehopeb---------.svg | 28 +- milstd2525/icons/ems/ehopec---------.svg | 28 +- milstd2525/icons/ems/ehoped---------.svg | 28 +- milstd2525/icons/ems/ehopee---------.svg | 28 +- milstd2525/icons/ems/enfaa----------.svg | 28 +- milstd2525/icons/ems/enfaaa---------.svg | 28 +- milstd2525/icons/ems/enfaab---------.svg | 28 +- milstd2525/icons/ems/enfaac---------.svg | 28 +- milstd2525/icons/ems/enfaad---------.svg | 28 +- milstd2525/icons/ems/enfaae---------.svg | 28 +- milstd2525/icons/ems/enfaaf---------.svg | 28 +- milstd2525/icons/ems/enfaag---------.svg | 28 +- milstd2525/icons/ems/enfab----------.svg | 28 +- milstd2525/icons/ems/enfaba---------.svg | 28 +- milstd2525/icons/ems/enfabb---------.svg | 28 +- milstd2525/icons/ems/enfabc---------.svg | 28 +- milstd2525/icons/ems/enfabd---------.svg | 28 +- milstd2525/icons/ems/enfabe---------.svg | 28 +- milstd2525/icons/ems/enfabf---------.svg | 28 +- milstd2525/icons/ems/enfac----------.svg | 28 +- milstd2525/icons/ems/enfaca---------.svg | 28 +- milstd2525/icons/ems/enfacb---------.svg | 28 +- milstd2525/icons/ems/enfacc---------.svg | 28 +- milstd2525/icons/ems/enfacd---------.svg | 28 +- milstd2525/icons/ems/enface---------.svg | 28 +- milstd2525/icons/ems/enfacf---------.svg | 28 +- milstd2525/icons/ems/enfacg---------.svg | 28 +- milstd2525/icons/ems/enfach---------.svg | 28 +- milstd2525/icons/ems/enfaci---------.svg | 28 +- milstd2525/icons/ems/enfacj---------.svg | 28 +- milstd2525/icons/ems/enfad----------.svg | 28 +- milstd2525/icons/ems/enfada---------.svg | 28 +- milstd2525/icons/ems/enfadb---------.svg | 28 +- milstd2525/icons/ems/enfaea---------.svg | 28 +- milstd2525/icons/ems/enfaeb---------.svg | 28 +- milstd2525/icons/ems/enfaee---------.svg | 28 +- milstd2525/icons/ems/enfaf----------.svg | 28 +- milstd2525/icons/ems/enfag----------.svg | 28 +- milstd2525/icons/ems/enfaga---------.svg | 28 +- milstd2525/icons/ems/enfah----------.svg | 28 +- milstd2525/icons/ems/enfaha---------.svg | 28 +- milstd2525/icons/ems/enfahb---------.svg | 28 +- milstd2525/icons/ems/enfai----------.svg | 28 +- milstd2525/icons/ems/enfaia---------.svg | 28 +- milstd2525/icons/ems/enfaib---------.svg | 28 +- milstd2525/icons/ems/enfaic---------.svg | 28 +- milstd2525/icons/ems/enfaid---------.svg | 28 +- milstd2525/icons/ems/enfaj----------.svg | 28 +- milstd2525/icons/ems/enfaja---------.svg | 28 +- milstd2525/icons/ems/enfajb---------.svg | 28 +- milstd2525/icons/ems/enfajc---------.svg | 28 +- milstd2525/icons/ems/enfak----------.svg | 28 +- milstd2525/icons/ems/enfakb---------.svg | 28 +- milstd2525/icons/ems/enfala---------.svg | 28 +- milstd2525/icons/ems/enfald---------.svg | 28 +- milstd2525/icons/ems/enfale---------.svg | 28 +- milstd2525/icons/ems/enfalf---------.svg | 28 +- milstd2525/icons/ems/enfalh---------.svg | 28 +- milstd2525/icons/ems/enfalj---------.svg | 28 +- milstd2525/icons/ems/enfalk---------.svg | 28 +- milstd2525/icons/ems/enfalm---------.svg | 28 +- milstd2525/icons/ems/enfalo---------.svg | 28 +- milstd2525/icons/ems/enfalp---------.svg | 28 +- milstd2525/icons/ems/enfama---------.svg | 28 +- milstd2525/icons/ems/enfamb---------.svg | 28 +- milstd2525/icons/ems/enfamc---------.svg | 28 +- milstd2525/icons/ems/enfamd---------.svg | 28 +- milstd2525/icons/ems/enfame---------.svg | 28 +- milstd2525/icons/ems/enfamf---------.svg | 28 +- milstd2525/icons/ems/enfamg---------.svg | 28 +- milstd2525/icons/ems/enfamh---------.svg | 28 +- milstd2525/icons/ems/enfami---------.svg | 28 +- milstd2525/icons/ems/enfpa----------.svg | 28 +- milstd2525/icons/ems/enfpaa---------.svg | 28 +- milstd2525/icons/ems/enfpab---------.svg | 28 +- milstd2525/icons/ems/enfpac---------.svg | 28 +- milstd2525/icons/ems/enfpad---------.svg | 28 +- milstd2525/icons/ems/enfpae---------.svg | 28 +- milstd2525/icons/ems/enfpaf---------.svg | 28 +- milstd2525/icons/ems/enfpag---------.svg | 28 +- milstd2525/icons/ems/enfpb----------.svg | 28 +- milstd2525/icons/ems/enfpba---------.svg | 28 +- milstd2525/icons/ems/enfpbb---------.svg | 28 +- milstd2525/icons/ems/enfpbc---------.svg | 28 +- milstd2525/icons/ems/enfpbd---------.svg | 28 +- milstd2525/icons/ems/enfpbe---------.svg | 28 +- milstd2525/icons/ems/enfpbf---------.svg | 28 +- milstd2525/icons/ems/enfpc----------.svg | 28 +- milstd2525/icons/ems/enfpca---------.svg | 28 +- milstd2525/icons/ems/enfpcb---------.svg | 28 +- milstd2525/icons/ems/enfpcc---------.svg | 28 +- milstd2525/icons/ems/enfpcd---------.svg | 28 +- milstd2525/icons/ems/enfpce---------.svg | 28 +- milstd2525/icons/ems/enfpcf---------.svg | 28 +- milstd2525/icons/ems/enfpcg---------.svg | 28 +- milstd2525/icons/ems/enfpch---------.svg | 28 +- milstd2525/icons/ems/enfpci---------.svg | 28 +- milstd2525/icons/ems/enfpcj---------.svg | 28 +- milstd2525/icons/ems/enfpd----------.svg | 28 +- milstd2525/icons/ems/enfpda---------.svg | 28 +- milstd2525/icons/ems/enfpdb---------.svg | 28 +- milstd2525/icons/ems/enfpea---------.svg | 28 +- milstd2525/icons/ems/enfpeb---------.svg | 28 +- milstd2525/icons/ems/enfpee---------.svg | 28 +- milstd2525/icons/ems/enfpf----------.svg | 28 +- milstd2525/icons/ems/enfpg----------.svg | 28 +- milstd2525/icons/ems/enfpga---------.svg | 28 +- milstd2525/icons/ems/enfph----------.svg | 28 +- milstd2525/icons/ems/enfpha---------.svg | 28 +- milstd2525/icons/ems/enfphb---------.svg | 28 +- milstd2525/icons/ems/enfpi----------.svg | 28 +- milstd2525/icons/ems/enfpia---------.svg | 28 +- milstd2525/icons/ems/enfpib---------.svg | 28 +- milstd2525/icons/ems/enfpic---------.svg | 28 +- milstd2525/icons/ems/enfpid---------.svg | 28 +- milstd2525/icons/ems/enfpj----------.svg | 28 +- milstd2525/icons/ems/enfpja---------.svg | 28 +- milstd2525/icons/ems/enfpjb---------.svg | 28 +- milstd2525/icons/ems/enfpjc---------.svg | 28 +- milstd2525/icons/ems/enfpk----------.svg | 28 +- milstd2525/icons/ems/enfpkb---------.svg | 28 +- milstd2525/icons/ems/enfpla---------.svg | 28 +- milstd2525/icons/ems/enfpld---------.svg | 28 +- milstd2525/icons/ems/enfple---------.svg | 28 +- milstd2525/icons/ems/enfplf---------.svg | 28 +- milstd2525/icons/ems/enfplh---------.svg | 28 +- milstd2525/icons/ems/enfplj---------.svg | 28 +- milstd2525/icons/ems/enfplk---------.svg | 28 +- milstd2525/icons/ems/enfplm---------.svg | 28 +- milstd2525/icons/ems/enfplo---------.svg | 28 +- milstd2525/icons/ems/enfplp---------.svg | 28 +- milstd2525/icons/ems/enfpma---------.svg | 28 +- milstd2525/icons/ems/enfpmb---------.svg | 28 +- milstd2525/icons/ems/enfpmc---------.svg | 28 +- milstd2525/icons/ems/enfpmd---------.svg | 28 +- milstd2525/icons/ems/enfpme---------.svg | 28 +- milstd2525/icons/ems/enfpmf---------.svg | 28 +- milstd2525/icons/ems/enfpmg---------.svg | 28 +- milstd2525/icons/ems/enfpmh---------.svg | 28 +- milstd2525/icons/ems/enfpmi---------.svg | 28 +- milstd2525/icons/ems/eniaa----------.svg | 28 +- milstd2525/icons/ems/eniaac---------.svg | 28 +- milstd2525/icons/ems/eniab----------.svg | 28 +- milstd2525/icons/ems/eniaba---------.svg | 28 +- milstd2525/icons/ems/eniabc---------.svg | 28 +- milstd2525/icons/ems/eniabd---------.svg | 28 +- milstd2525/icons/ems/eniabf---------.svg | 28 +- milstd2525/icons/ems/eniac----------.svg | 28 +- milstd2525/icons/ems/eniaca---------.svg | 28 +- milstd2525/icons/ems/eniacb---------.svg | 28 +- milstd2525/icons/ems/eniacc---------.svg | 28 +- milstd2525/icons/ems/eniacd---------.svg | 28 +- milstd2525/icons/ems/eniace---------.svg | 28 +- milstd2525/icons/ems/eniacf---------.svg | 28 +- milstd2525/icons/ems/eniacg---------.svg | 28 +- milstd2525/icons/ems/eniach---------.svg | 28 +- milstd2525/icons/ems/eniad----------.svg | 28 +- milstd2525/icons/ems/eniada---------.svg | 28 +- milstd2525/icons/ems/eniadb---------.svg | 28 +- milstd2525/icons/ems/eniadc---------.svg | 28 +- milstd2525/icons/ems/eniadd---------.svg | 28 +- milstd2525/icons/ems/eniade---------.svg | 28 +- milstd2525/icons/ems/eniadf---------.svg | 28 +- milstd2525/icons/ems/eniadg---------.svg | 28 +- milstd2525/icons/ems/eniadh---------.svg | 28 +- milstd2525/icons/ems/eniadi---------.svg | 28 +- milstd2525/icons/ems/eniadj---------.svg | 28 +- milstd2525/icons/ems/eniadk---------.svg | 28 +- milstd2525/icons/ems/eniadl---------.svg | 28 +- milstd2525/icons/ems/eniadm---------.svg | 28 +- milstd2525/icons/ems/eniadn---------.svg | 28 +- milstd2525/icons/ems/eniado---------.svg | 28 +- milstd2525/icons/ems/eniae----------.svg | 28 +- milstd2525/icons/ems/eniaea---------.svg | 28 +- milstd2525/icons/ems/eniaf----------.svg | 28 +- milstd2525/icons/ems/eniafa---------.svg | 28 +- milstd2525/icons/ems/eniag----------.svg | 28 +- milstd2525/icons/ems/eniaga---------.svg | 28 +- milstd2525/icons/ems/eniagb---------.svg | 28 +- milstd2525/icons/ems/eniah----------.svg | 28 +- milstd2525/icons/ems/eniaha---------.svg | 28 +- milstd2525/icons/ems/enipa----------.svg | 28 +- milstd2525/icons/ems/enipac---------.svg | 28 +- milstd2525/icons/ems/enipb----------.svg | 28 +- milstd2525/icons/ems/enipba---------.svg | 28 +- milstd2525/icons/ems/enipbc---------.svg | 28 +- milstd2525/icons/ems/enipbd---------.svg | 28 +- milstd2525/icons/ems/enipbf---------.svg | 28 +- milstd2525/icons/ems/enipc----------.svg | 28 +- milstd2525/icons/ems/enipca---------.svg | 28 +- milstd2525/icons/ems/enipcb---------.svg | 28 +- milstd2525/icons/ems/enipcc---------.svg | 28 +- milstd2525/icons/ems/enipcd---------.svg | 28 +- milstd2525/icons/ems/enipce---------.svg | 28 +- milstd2525/icons/ems/enipcf---------.svg | 28 +- milstd2525/icons/ems/enipcg---------.svg | 28 +- milstd2525/icons/ems/enipch---------.svg | 28 +- milstd2525/icons/ems/enipd----------.svg | 28 +- milstd2525/icons/ems/enipda---------.svg | 28 +- milstd2525/icons/ems/enipdb---------.svg | 28 +- milstd2525/icons/ems/enipdc---------.svg | 28 +- milstd2525/icons/ems/enipdd---------.svg | 28 +- milstd2525/icons/ems/enipde---------.svg | 28 +- milstd2525/icons/ems/enipdf---------.svg | 28 +- milstd2525/icons/ems/enipdg---------.svg | 28 +- milstd2525/icons/ems/enipdh---------.svg | 28 +- milstd2525/icons/ems/enipdi---------.svg | 28 +- milstd2525/icons/ems/enipdj---------.svg | 28 +- milstd2525/icons/ems/enipdk---------.svg | 28 +- milstd2525/icons/ems/enipdl---------.svg | 28 +- milstd2525/icons/ems/enipdm---------.svg | 28 +- milstd2525/icons/ems/enipdn---------.svg | 28 +- milstd2525/icons/ems/enipdo---------.svg | 28 +- milstd2525/icons/ems/enipe----------.svg | 28 +- milstd2525/icons/ems/enipea---------.svg | 28 +- milstd2525/icons/ems/enipf----------.svg | 28 +- milstd2525/icons/ems/enipfa---------.svg | 28 +- milstd2525/icons/ems/enipg----------.svg | 28 +- milstd2525/icons/ems/enipga---------.svg | 28 +- milstd2525/icons/ems/enipgb---------.svg | 28 +- milstd2525/icons/ems/eniph----------.svg | 28 +- milstd2525/icons/ems/enipha---------.svg | 28 +- milstd2525/icons/ems/enoaa----------.svg | 28 +- milstd2525/icons/ems/enoaaa---------.svg | 28 +- milstd2525/icons/ems/enoaab---------.svg | 28 +- milstd2525/icons/ems/enoaac---------.svg | 28 +- milstd2525/icons/ems/enoaad---------.svg | 28 +- milstd2525/icons/ems/enoaae---------.svg | 28 +- milstd2525/icons/ems/enoaaf---------.svg | 28 +- milstd2525/icons/ems/enoaag---------.svg | 28 +- milstd2525/icons/ems/enoaaj---------.svg | 28 +- milstd2525/icons/ems/enoaak---------.svg | 28 +- milstd2525/icons/ems/enoaal---------.svg | 28 +- milstd2525/icons/ems/enoaam---------.svg | 28 +- milstd2525/icons/ems/enoab----------.svg | 28 +- milstd2525/icons/ems/enoaba---------.svg | 28 +- milstd2525/icons/ems/enoabb---------.svg | 28 +- milstd2525/icons/ems/enoabc---------.svg | 28 +- milstd2525/icons/ems/enoabd---------.svg | 28 +- milstd2525/icons/ems/enoabe---------.svg | 28 +- milstd2525/icons/ems/enoabf---------.svg | 28 +- milstd2525/icons/ems/enoabg---------.svg | 28 +- milstd2525/icons/ems/enoabh---------.svg | 28 +- milstd2525/icons/ems/enoabi---------.svg | 28 +- milstd2525/icons/ems/enoabj---------.svg | 28 +- milstd2525/icons/ems/enoabk---------.svg | 28 +- milstd2525/icons/ems/enoabl---------.svg | 28 +- milstd2525/icons/ems/enoac----------.svg | 28 +- milstd2525/icons/ems/enoaca---------.svg | 28 +- milstd2525/icons/ems/enoacb---------.svg | 28 +- milstd2525/icons/ems/enoacc---------.svg | 28 +- milstd2525/icons/ems/enoacd---------.svg | 28 +- milstd2525/icons/ems/enoace---------.svg | 28 +- milstd2525/icons/ems/enoad----------.svg | 28 +- milstd2525/icons/ems/enoada---------.svg | 28 +- milstd2525/icons/ems/enoadb---------.svg | 28 +- milstd2525/icons/ems/enoadc---------.svg | 28 +- milstd2525/icons/ems/enoadd---------.svg | 28 +- milstd2525/icons/ems/enoadda--------.svg | 28 +- milstd2525/icons/ems/enoaddb--------.svg | 28 +- milstd2525/icons/ems/enoaddc--------.svg | 28 +- milstd2525/icons/ems/enoade---------.svg | 28 +- milstd2525/icons/ems/enoadea--------.svg | 28 +- milstd2525/icons/ems/enoadeb--------.svg | 28 +- milstd2525/icons/ems/enoadec--------.svg | 28 +- milstd2525/icons/ems/enoadf---------.svg | 28 +- milstd2525/icons/ems/enoadfa--------.svg | 28 +- milstd2525/icons/ems/enoadfb--------.svg | 28 +- milstd2525/icons/ems/enoadfc--------.svg | 28 +- milstd2525/icons/ems/enoadg---------.svg | 28 +- milstd2525/icons/ems/enoadga--------.svg | 28 +- milstd2525/icons/ems/enoadgb--------.svg | 28 +- milstd2525/icons/ems/enoadgc--------.svg | 28 +- milstd2525/icons/ems/enoadh---------.svg | 28 +- milstd2525/icons/ems/enoadha--------.svg | 28 +- milstd2525/icons/ems/enoadhb--------.svg | 28 +- milstd2525/icons/ems/enoadhc--------.svg | 28 +- milstd2525/icons/ems/enoadi---------.svg | 28 +- milstd2525/icons/ems/enoadia--------.svg | 28 +- milstd2525/icons/ems/enoadib--------.svg | 28 +- milstd2525/icons/ems/enoadic--------.svg | 28 +- milstd2525/icons/ems/enoadj---------.svg | 28 +- milstd2525/icons/ems/enoadjb--------.svg | 28 +- milstd2525/icons/ems/enoadjc--------.svg | 28 +- milstd2525/icons/ems/enoadk---------.svg | 28 +- milstd2525/icons/ems/enoadl---------.svg | 28 +- milstd2525/icons/ems/enoadla--------.svg | 28 +- milstd2525/icons/ems/enoadlb--------.svg | 28 +- milstd2525/icons/ems/enoadlc--------.svg | 28 +- milstd2525/icons/ems/enoadm---------.svg | 28 +- milstd2525/icons/ems/enoadma--------.svg | 28 +- milstd2525/icons/ems/enoadmb--------.svg | 28 +- milstd2525/icons/ems/enoadmc--------.svg | 28 +- milstd2525/icons/ems/enoadn---------.svg | 28 +- milstd2525/icons/ems/enoadna--------.svg | 28 +- milstd2525/icons/ems/enoadnc--------.svg | 28 +- milstd2525/icons/ems/enoado---------.svg | 28 +- milstd2525/icons/ems/enoadoa--------.svg | 28 +- milstd2525/icons/ems/enoadob--------.svg | 28 +- milstd2525/icons/ems/enoadoc--------.svg | 28 +- milstd2525/icons/ems/enoaea---------.svg | 28 +- milstd2525/icons/ems/enoaeb---------.svg | 28 +- milstd2525/icons/ems/enoaec---------.svg | 28 +- milstd2525/icons/ems/enoaed---------.svg | 28 +- milstd2525/icons/ems/enoaee---------.svg | 28 +- milstd2525/icons/ems/enopa----------.svg | 28 +- milstd2525/icons/ems/enopaa---------.svg | 28 +- milstd2525/icons/ems/enopab---------.svg | 28 +- milstd2525/icons/ems/enopac---------.svg | 28 +- milstd2525/icons/ems/enopad---------.svg | 28 +- milstd2525/icons/ems/enopae---------.svg | 28 +- milstd2525/icons/ems/enopaf---------.svg | 28 +- milstd2525/icons/ems/enopag---------.svg | 28 +- milstd2525/icons/ems/enopaj---------.svg | 28 +- milstd2525/icons/ems/enopak---------.svg | 28 +- milstd2525/icons/ems/enopal---------.svg | 28 +- milstd2525/icons/ems/enopam---------.svg | 28 +- milstd2525/icons/ems/enopb----------.svg | 28 +- milstd2525/icons/ems/enopba---------.svg | 28 +- milstd2525/icons/ems/enopbb---------.svg | 28 +- milstd2525/icons/ems/enopbc---------.svg | 28 +- milstd2525/icons/ems/enopbd---------.svg | 28 +- milstd2525/icons/ems/enopbe---------.svg | 28 +- milstd2525/icons/ems/enopbf---------.svg | 28 +- milstd2525/icons/ems/enopbg---------.svg | 28 +- milstd2525/icons/ems/enopbh---------.svg | 28 +- milstd2525/icons/ems/enopbi---------.svg | 28 +- milstd2525/icons/ems/enopbj---------.svg | 28 +- milstd2525/icons/ems/enopbk---------.svg | 28 +- milstd2525/icons/ems/enopbl---------.svg | 28 +- milstd2525/icons/ems/enopc----------.svg | 28 +- milstd2525/icons/ems/enopca---------.svg | 28 +- milstd2525/icons/ems/enopcb---------.svg | 28 +- milstd2525/icons/ems/enopcc---------.svg | 28 +- milstd2525/icons/ems/enopcd---------.svg | 28 +- milstd2525/icons/ems/enopce---------.svg | 28 +- milstd2525/icons/ems/enopd----------.svg | 28 +- milstd2525/icons/ems/enopda---------.svg | 28 +- milstd2525/icons/ems/enopdb---------.svg | 28 +- milstd2525/icons/ems/enopdc---------.svg | 28 +- milstd2525/icons/ems/enopdd---------.svg | 28 +- milstd2525/icons/ems/enopdda--------.svg | 28 +- milstd2525/icons/ems/enopddb--------.svg | 28 +- milstd2525/icons/ems/enopddc--------.svg | 28 +- milstd2525/icons/ems/enopde---------.svg | 28 +- milstd2525/icons/ems/enopdea--------.svg | 28 +- milstd2525/icons/ems/enopdeb--------.svg | 28 +- milstd2525/icons/ems/enopdec--------.svg | 28 +- milstd2525/icons/ems/enopdf---------.svg | 28 +- milstd2525/icons/ems/enopdfa--------.svg | 28 +- milstd2525/icons/ems/enopdfb--------.svg | 28 +- milstd2525/icons/ems/enopdfc--------.svg | 28 +- milstd2525/icons/ems/enopdg---------.svg | 28 +- milstd2525/icons/ems/enopdga--------.svg | 28 +- milstd2525/icons/ems/enopdgb--------.svg | 28 +- milstd2525/icons/ems/enopdgc--------.svg | 28 +- milstd2525/icons/ems/enopdh---------.svg | 28 +- milstd2525/icons/ems/enopdha--------.svg | 28 +- milstd2525/icons/ems/enopdhb--------.svg | 28 +- milstd2525/icons/ems/enopdhc--------.svg | 28 +- milstd2525/icons/ems/enopdi---------.svg | 28 +- milstd2525/icons/ems/enopdia--------.svg | 28 +- milstd2525/icons/ems/enopdib--------.svg | 28 +- milstd2525/icons/ems/enopdic--------.svg | 28 +- milstd2525/icons/ems/enopdj---------.svg | 28 +- milstd2525/icons/ems/enopdjb--------.svg | 28 +- milstd2525/icons/ems/enopdjc--------.svg | 28 +- milstd2525/icons/ems/enopdk---------.svg | 28 +- milstd2525/icons/ems/enopdl---------.svg | 28 +- milstd2525/icons/ems/enopdla--------.svg | 28 +- milstd2525/icons/ems/enopdlb--------.svg | 28 +- milstd2525/icons/ems/enopdlc--------.svg | 28 +- milstd2525/icons/ems/enopdm---------.svg | 28 +- milstd2525/icons/ems/enopdma--------.svg | 28 +- milstd2525/icons/ems/enopdmb--------.svg | 28 +- milstd2525/icons/ems/enopdmc--------.svg | 28 +- milstd2525/icons/ems/enopdn---------.svg | 28 +- milstd2525/icons/ems/enopdna--------.svg | 28 +- milstd2525/icons/ems/enopdnc--------.svg | 28 +- milstd2525/icons/ems/enopdo---------.svg | 28 +- milstd2525/icons/ems/enopdoa--------.svg | 28 +- milstd2525/icons/ems/enopdob--------.svg | 28 +- milstd2525/icons/ems/enopdoc--------.svg | 28 +- milstd2525/icons/ems/enopea---------.svg | 28 +- milstd2525/icons/ems/enopeb---------.svg | 28 +- milstd2525/icons/ems/enopec---------.svg | 28 +- milstd2525/icons/ems/enoped---------.svg | 28 +- milstd2525/icons/ems/enopee---------.svg | 28 +- milstd2525/icons/ems/eufaa----------.svg | 28 +- milstd2525/icons/ems/eufaaa---------.svg | 28 +- milstd2525/icons/ems/eufaab---------.svg | 28 +- milstd2525/icons/ems/eufaac---------.svg | 28 +- milstd2525/icons/ems/eufaad---------.svg | 28 +- milstd2525/icons/ems/eufaae---------.svg | 28 +- milstd2525/icons/ems/eufaaf---------.svg | 28 +- milstd2525/icons/ems/eufaag---------.svg | 28 +- milstd2525/icons/ems/eufab----------.svg | 28 +- milstd2525/icons/ems/eufaba---------.svg | 28 +- milstd2525/icons/ems/eufabb---------.svg | 28 +- milstd2525/icons/ems/eufabc---------.svg | 28 +- milstd2525/icons/ems/eufabd---------.svg | 28 +- milstd2525/icons/ems/eufabe---------.svg | 28 +- milstd2525/icons/ems/eufabf---------.svg | 28 +- milstd2525/icons/ems/eufac----------.svg | 28 +- milstd2525/icons/ems/eufaca---------.svg | 28 +- milstd2525/icons/ems/eufacb---------.svg | 28 +- milstd2525/icons/ems/eufacc---------.svg | 28 +- milstd2525/icons/ems/eufacd---------.svg | 28 +- milstd2525/icons/ems/euface---------.svg | 28 +- milstd2525/icons/ems/eufacf---------.svg | 28 +- milstd2525/icons/ems/eufacg---------.svg | 28 +- milstd2525/icons/ems/eufach---------.svg | 28 +- milstd2525/icons/ems/eufaci---------.svg | 28 +- milstd2525/icons/ems/eufacj---------.svg | 28 +- milstd2525/icons/ems/eufad----------.svg | 28 +- milstd2525/icons/ems/eufada---------.svg | 28 +- milstd2525/icons/ems/eufadb---------.svg | 28 +- milstd2525/icons/ems/eufaea---------.svg | 28 +- milstd2525/icons/ems/eufaeb---------.svg | 28 +- milstd2525/icons/ems/eufaee---------.svg | 28 +- milstd2525/icons/ems/eufaf----------.svg | 28 +- milstd2525/icons/ems/eufag----------.svg | 28 +- milstd2525/icons/ems/eufaga---------.svg | 28 +- milstd2525/icons/ems/eufah----------.svg | 28 +- milstd2525/icons/ems/eufaha---------.svg | 28 +- milstd2525/icons/ems/eufahb---------.svg | 28 +- milstd2525/icons/ems/eufai----------.svg | 28 +- milstd2525/icons/ems/eufaia---------.svg | 28 +- milstd2525/icons/ems/eufaib---------.svg | 28 +- milstd2525/icons/ems/eufaic---------.svg | 28 +- milstd2525/icons/ems/eufaid---------.svg | 28 +- milstd2525/icons/ems/eufaj----------.svg | 28 +- milstd2525/icons/ems/eufaja---------.svg | 28 +- milstd2525/icons/ems/eufajb---------.svg | 28 +- milstd2525/icons/ems/eufajc---------.svg | 28 +- milstd2525/icons/ems/eufak----------.svg | 28 +- milstd2525/icons/ems/eufakb---------.svg | 28 +- milstd2525/icons/ems/eufala---------.svg | 28 +- milstd2525/icons/ems/eufald---------.svg | 28 +- milstd2525/icons/ems/eufale---------.svg | 28 +- milstd2525/icons/ems/eufalf---------.svg | 28 +- milstd2525/icons/ems/eufalh---------.svg | 28 +- milstd2525/icons/ems/eufalj---------.svg | 28 +- milstd2525/icons/ems/eufalk---------.svg | 28 +- milstd2525/icons/ems/eufalm---------.svg | 28 +- milstd2525/icons/ems/eufalo---------.svg | 28 +- milstd2525/icons/ems/eufalp---------.svg | 28 +- milstd2525/icons/ems/eufama---------.svg | 28 +- milstd2525/icons/ems/eufamb---------.svg | 28 +- milstd2525/icons/ems/eufamc---------.svg | 28 +- milstd2525/icons/ems/eufamd---------.svg | 28 +- milstd2525/icons/ems/eufame---------.svg | 28 +- milstd2525/icons/ems/eufamf---------.svg | 28 +- milstd2525/icons/ems/eufamg---------.svg | 28 +- milstd2525/icons/ems/eufamh---------.svg | 28 +- milstd2525/icons/ems/eufami---------.svg | 28 +- milstd2525/icons/ems/eufpa----------.svg | 28 +- milstd2525/icons/ems/eufpaa---------.svg | 28 +- milstd2525/icons/ems/eufpab---------.svg | 28 +- milstd2525/icons/ems/eufpac---------.svg | 28 +- milstd2525/icons/ems/eufpad---------.svg | 28 +- milstd2525/icons/ems/eufpae---------.svg | 28 +- milstd2525/icons/ems/eufpaf---------.svg | 28 +- milstd2525/icons/ems/eufpag---------.svg | 28 +- milstd2525/icons/ems/eufpb----------.svg | 28 +- milstd2525/icons/ems/eufpba---------.svg | 28 +- milstd2525/icons/ems/eufpbb---------.svg | 28 +- milstd2525/icons/ems/eufpbc---------.svg | 28 +- milstd2525/icons/ems/eufpbd---------.svg | 28 +- milstd2525/icons/ems/eufpbe---------.svg | 28 +- milstd2525/icons/ems/eufpbf---------.svg | 28 +- milstd2525/icons/ems/eufpc----------.svg | 28 +- milstd2525/icons/ems/eufpca---------.svg | 28 +- milstd2525/icons/ems/eufpcb---------.svg | 28 +- milstd2525/icons/ems/eufpcc---------.svg | 28 +- milstd2525/icons/ems/eufpcd---------.svg | 28 +- milstd2525/icons/ems/eufpce---------.svg | 28 +- milstd2525/icons/ems/eufpcf---------.svg | 28 +- milstd2525/icons/ems/eufpcg---------.svg | 28 +- milstd2525/icons/ems/eufpch---------.svg | 28 +- milstd2525/icons/ems/eufpci---------.svg | 28 +- milstd2525/icons/ems/eufpcj---------.svg | 28 +- milstd2525/icons/ems/eufpd----------.svg | 28 +- milstd2525/icons/ems/eufpda---------.svg | 28 +- milstd2525/icons/ems/eufpdb---------.svg | 28 +- milstd2525/icons/ems/eufpea---------.svg | 28 +- milstd2525/icons/ems/eufpeb---------.svg | 28 +- milstd2525/icons/ems/eufpee---------.svg | 28 +- milstd2525/icons/ems/eufpf----------.svg | 28 +- milstd2525/icons/ems/eufpg----------.svg | 28 +- milstd2525/icons/ems/eufpga---------.svg | 28 +- milstd2525/icons/ems/eufph----------.svg | 28 +- milstd2525/icons/ems/eufpha---------.svg | 28 +- milstd2525/icons/ems/eufphb---------.svg | 28 +- milstd2525/icons/ems/eufpi----------.svg | 28 +- milstd2525/icons/ems/eufpia---------.svg | 28 +- milstd2525/icons/ems/eufpib---------.svg | 28 +- milstd2525/icons/ems/eufpic---------.svg | 28 +- milstd2525/icons/ems/eufpid---------.svg | 28 +- milstd2525/icons/ems/eufpj----------.svg | 28 +- milstd2525/icons/ems/eufpja---------.svg | 28 +- milstd2525/icons/ems/eufpjb---------.svg | 28 +- milstd2525/icons/ems/eufpjc---------.svg | 28 +- milstd2525/icons/ems/eufpk----------.svg | 28 +- milstd2525/icons/ems/eufpkb---------.svg | 28 +- milstd2525/icons/ems/eufpla---------.svg | 28 +- milstd2525/icons/ems/eufpld---------.svg | 28 +- milstd2525/icons/ems/eufple---------.svg | 28 +- milstd2525/icons/ems/eufplf---------.svg | 28 +- milstd2525/icons/ems/eufplh---------.svg | 28 +- milstd2525/icons/ems/eufplj---------.svg | 28 +- milstd2525/icons/ems/eufplk---------.svg | 28 +- milstd2525/icons/ems/eufplm---------.svg | 28 +- milstd2525/icons/ems/eufplo---------.svg | 28 +- milstd2525/icons/ems/eufplp---------.svg | 28 +- milstd2525/icons/ems/eufpma---------.svg | 28 +- milstd2525/icons/ems/eufpmb---------.svg | 28 +- milstd2525/icons/ems/eufpmc---------.svg | 28 +- milstd2525/icons/ems/eufpmd---------.svg | 28 +- milstd2525/icons/ems/eufpme---------.svg | 28 +- milstd2525/icons/ems/eufpmf---------.svg | 28 +- milstd2525/icons/ems/eufpmg---------.svg | 28 +- milstd2525/icons/ems/eufpmh---------.svg | 28 +- milstd2525/icons/ems/eufpmi---------.svg | 28 +- milstd2525/icons/ems/euiaa----------.svg | 28 +- milstd2525/icons/ems/euiaac---------.svg | 28 +- milstd2525/icons/ems/euiab----------.svg | 28 +- milstd2525/icons/ems/euiaba---------.svg | 28 +- milstd2525/icons/ems/euiabc---------.svg | 28 +- milstd2525/icons/ems/euiabd---------.svg | 28 +- milstd2525/icons/ems/euiabf---------.svg | 28 +- milstd2525/icons/ems/euiac----------.svg | 28 +- milstd2525/icons/ems/euiaca---------.svg | 28 +- milstd2525/icons/ems/euiacb---------.svg | 28 +- milstd2525/icons/ems/euiacc---------.svg | 28 +- milstd2525/icons/ems/euiacd---------.svg | 28 +- milstd2525/icons/ems/euiace---------.svg | 28 +- milstd2525/icons/ems/euiacf---------.svg | 28 +- milstd2525/icons/ems/euiacg---------.svg | 28 +- milstd2525/icons/ems/euiach---------.svg | 28 +- milstd2525/icons/ems/euiad----------.svg | 28 +- milstd2525/icons/ems/euiada---------.svg | 28 +- milstd2525/icons/ems/euiadb---------.svg | 28 +- milstd2525/icons/ems/euiadc---------.svg | 28 +- milstd2525/icons/ems/euiadd---------.svg | 28 +- milstd2525/icons/ems/euiade---------.svg | 28 +- milstd2525/icons/ems/euiadf---------.svg | 28 +- milstd2525/icons/ems/euiadg---------.svg | 28 +- milstd2525/icons/ems/euiadh---------.svg | 28 +- milstd2525/icons/ems/euiadi---------.svg | 28 +- milstd2525/icons/ems/euiadj---------.svg | 28 +- milstd2525/icons/ems/euiadk---------.svg | 28 +- milstd2525/icons/ems/euiadl---------.svg | 28 +- milstd2525/icons/ems/euiadm---------.svg | 28 +- milstd2525/icons/ems/euiadn---------.svg | 28 +- milstd2525/icons/ems/euiado---------.svg | 28 +- milstd2525/icons/ems/euiae----------.svg | 28 +- milstd2525/icons/ems/euiaea---------.svg | 28 +- milstd2525/icons/ems/euiaf----------.svg | 28 +- milstd2525/icons/ems/euiafa---------.svg | 28 +- milstd2525/icons/ems/euiag----------.svg | 28 +- milstd2525/icons/ems/euiaga---------.svg | 28 +- milstd2525/icons/ems/euiagb---------.svg | 28 +- milstd2525/icons/ems/euiah----------.svg | 28 +- milstd2525/icons/ems/euiaha---------.svg | 28 +- milstd2525/icons/ems/euipa----------.svg | 28 +- milstd2525/icons/ems/euipac---------.svg | 28 +- milstd2525/icons/ems/euipb----------.svg | 28 +- milstd2525/icons/ems/euipba---------.svg | 28 +- milstd2525/icons/ems/euipbc---------.svg | 28 +- milstd2525/icons/ems/euipbd---------.svg | 28 +- milstd2525/icons/ems/euipbf---------.svg | 28 +- milstd2525/icons/ems/euipc----------.svg | 28 +- milstd2525/icons/ems/euipca---------.svg | 28 +- milstd2525/icons/ems/euipcb---------.svg | 28 +- milstd2525/icons/ems/euipcc---------.svg | 28 +- milstd2525/icons/ems/euipcd---------.svg | 28 +- milstd2525/icons/ems/euipce---------.svg | 28 +- milstd2525/icons/ems/euipcf---------.svg | 28 +- milstd2525/icons/ems/euipcg---------.svg | 28 +- milstd2525/icons/ems/euipch---------.svg | 28 +- milstd2525/icons/ems/euipd----------.svg | 28 +- milstd2525/icons/ems/euipda---------.svg | 28 +- milstd2525/icons/ems/euipdb---------.svg | 28 +- milstd2525/icons/ems/euipdc---------.svg | 28 +- milstd2525/icons/ems/euipdd---------.svg | 28 +- milstd2525/icons/ems/euipde---------.svg | 28 +- milstd2525/icons/ems/euipdf---------.svg | 28 +- milstd2525/icons/ems/euipdg---------.svg | 28 +- milstd2525/icons/ems/euipdh---------.svg | 28 +- milstd2525/icons/ems/euipdi---------.svg | 28 +- milstd2525/icons/ems/euipdj---------.svg | 28 +- milstd2525/icons/ems/euipdk---------.svg | 28 +- milstd2525/icons/ems/euipdl---------.svg | 28 +- milstd2525/icons/ems/euipdm---------.svg | 28 +- milstd2525/icons/ems/euipdn---------.svg | 28 +- milstd2525/icons/ems/euipdo---------.svg | 28 +- milstd2525/icons/ems/euipe----------.svg | 28 +- milstd2525/icons/ems/euipea---------.svg | 28 +- milstd2525/icons/ems/euipf----------.svg | 28 +- milstd2525/icons/ems/euipfa---------.svg | 28 +- milstd2525/icons/ems/euipg----------.svg | 28 +- milstd2525/icons/ems/euipga---------.svg | 28 +- milstd2525/icons/ems/euipgb---------.svg | 28 +- milstd2525/icons/ems/euiph----------.svg | 28 +- milstd2525/icons/ems/euipha---------.svg | 28 +- milstd2525/icons/ems/euoaa----------.svg | 28 +- milstd2525/icons/ems/euoaaa---------.svg | 28 +- milstd2525/icons/ems/euoaab---------.svg | 28 +- milstd2525/icons/ems/euoaac---------.svg | 28 +- milstd2525/icons/ems/euoaad---------.svg | 28 +- milstd2525/icons/ems/euoaae---------.svg | 28 +- milstd2525/icons/ems/euoaaf---------.svg | 28 +- milstd2525/icons/ems/euoaag---------.svg | 28 +- milstd2525/icons/ems/euoaaj---------.svg | 28 +- milstd2525/icons/ems/euoaak---------.svg | 28 +- milstd2525/icons/ems/euoaal---------.svg | 28 +- milstd2525/icons/ems/euoaam---------.svg | 28 +- milstd2525/icons/ems/euoab----------.svg | 28 +- milstd2525/icons/ems/euoaba---------.svg | 28 +- milstd2525/icons/ems/euoabb---------.svg | 28 +- milstd2525/icons/ems/euoabc---------.svg | 28 +- milstd2525/icons/ems/euoabd---------.svg | 28 +- milstd2525/icons/ems/euoabe---------.svg | 28 +- milstd2525/icons/ems/euoabf---------.svg | 28 +- milstd2525/icons/ems/euoabg---------.svg | 28 +- milstd2525/icons/ems/euoabh---------.svg | 28 +- milstd2525/icons/ems/euoabi---------.svg | 28 +- milstd2525/icons/ems/euoabj---------.svg | 28 +- milstd2525/icons/ems/euoabk---------.svg | 28 +- milstd2525/icons/ems/euoabl---------.svg | 28 +- milstd2525/icons/ems/euoac----------.svg | 28 +- milstd2525/icons/ems/euoaca---------.svg | 28 +- milstd2525/icons/ems/euoacb---------.svg | 28 +- milstd2525/icons/ems/euoacc---------.svg | 28 +- milstd2525/icons/ems/euoacd---------.svg | 28 +- milstd2525/icons/ems/euoace---------.svg | 28 +- milstd2525/icons/ems/euoad----------.svg | 28 +- milstd2525/icons/ems/euoada---------.svg | 28 +- milstd2525/icons/ems/euoadb---------.svg | 28 +- milstd2525/icons/ems/euoadc---------.svg | 28 +- milstd2525/icons/ems/euoadd---------.svg | 28 +- milstd2525/icons/ems/euoadda--------.svg | 28 +- milstd2525/icons/ems/euoaddb--------.svg | 28 +- milstd2525/icons/ems/euoaddc--------.svg | 28 +- milstd2525/icons/ems/euoade---------.svg | 28 +- milstd2525/icons/ems/euoadea--------.svg | 28 +- milstd2525/icons/ems/euoadeb--------.svg | 28 +- milstd2525/icons/ems/euoadec--------.svg | 28 +- milstd2525/icons/ems/euoadf---------.svg | 28 +- milstd2525/icons/ems/euoadfa--------.svg | 28 +- milstd2525/icons/ems/euoadfb--------.svg | 28 +- milstd2525/icons/ems/euoadfc--------.svg | 28 +- milstd2525/icons/ems/euoadg---------.svg | 28 +- milstd2525/icons/ems/euoadga--------.svg | 28 +- milstd2525/icons/ems/euoadgb--------.svg | 28 +- milstd2525/icons/ems/euoadgc--------.svg | 28 +- milstd2525/icons/ems/euoadh---------.svg | 28 +- milstd2525/icons/ems/euoadha--------.svg | 28 +- milstd2525/icons/ems/euoadhb--------.svg | 28 +- milstd2525/icons/ems/euoadhc--------.svg | 28 +- milstd2525/icons/ems/euoadi---------.svg | 28 +- milstd2525/icons/ems/euoadia--------.svg | 28 +- milstd2525/icons/ems/euoadib--------.svg | 28 +- milstd2525/icons/ems/euoadic--------.svg | 28 +- milstd2525/icons/ems/euoadj---------.svg | 28 +- milstd2525/icons/ems/euoadjb--------.svg | 28 +- milstd2525/icons/ems/euoadjc--------.svg | 28 +- milstd2525/icons/ems/euoadk---------.svg | 28 +- milstd2525/icons/ems/euoadl---------.svg | 28 +- milstd2525/icons/ems/euoadla--------.svg | 28 +- milstd2525/icons/ems/euoadlb--------.svg | 28 +- milstd2525/icons/ems/euoadlc--------.svg | 28 +- milstd2525/icons/ems/euoadm---------.svg | 28 +- milstd2525/icons/ems/euoadma--------.svg | 28 +- milstd2525/icons/ems/euoadmb--------.svg | 28 +- milstd2525/icons/ems/euoadmc--------.svg | 28 +- milstd2525/icons/ems/euoadn---------.svg | 28 +- milstd2525/icons/ems/euoadna--------.svg | 28 +- milstd2525/icons/ems/euoadnc--------.svg | 28 +- milstd2525/icons/ems/euoado---------.svg | 28 +- milstd2525/icons/ems/euoadoa--------.svg | 28 +- milstd2525/icons/ems/euoadob--------.svg | 28 +- milstd2525/icons/ems/euoadoc--------.svg | 28 +- milstd2525/icons/ems/euoaea---------.svg | 28 +- milstd2525/icons/ems/euoaeb---------.svg | 28 +- milstd2525/icons/ems/euoaec---------.svg | 28 +- milstd2525/icons/ems/euoaed---------.svg | 28 +- milstd2525/icons/ems/euoaee---------.svg | 28 +- milstd2525/icons/ems/euopa----------.svg | 28 +- milstd2525/icons/ems/euopaa---------.svg | 28 +- milstd2525/icons/ems/euopab---------.svg | 28 +- milstd2525/icons/ems/euopac---------.svg | 28 +- milstd2525/icons/ems/euopad---------.svg | 28 +- milstd2525/icons/ems/euopae---------.svg | 28 +- milstd2525/icons/ems/euopaf---------.svg | 28 +- milstd2525/icons/ems/euopag---------.svg | 28 +- milstd2525/icons/ems/euopaj---------.svg | 28 +- milstd2525/icons/ems/euopak---------.svg | 28 +- milstd2525/icons/ems/euopal---------.svg | 28 +- milstd2525/icons/ems/euopam---------.svg | 28 +- milstd2525/icons/ems/euopb----------.svg | 28 +- milstd2525/icons/ems/euopba---------.svg | 28 +- milstd2525/icons/ems/euopbb---------.svg | 28 +- milstd2525/icons/ems/euopbc---------.svg | 28 +- milstd2525/icons/ems/euopbd---------.svg | 28 +- milstd2525/icons/ems/euopbe---------.svg | 28 +- milstd2525/icons/ems/euopbf---------.svg | 28 +- milstd2525/icons/ems/euopbg---------.svg | 28 +- milstd2525/icons/ems/euopbh---------.svg | 28 +- milstd2525/icons/ems/euopbi---------.svg | 28 +- milstd2525/icons/ems/euopbj---------.svg | 28 +- milstd2525/icons/ems/euopbk---------.svg | 28 +- milstd2525/icons/ems/euopbl---------.svg | 28 +- milstd2525/icons/ems/euopc----------.svg | 28 +- milstd2525/icons/ems/euopca---------.svg | 28 +- milstd2525/icons/ems/euopcb---------.svg | 28 +- milstd2525/icons/ems/euopcc---------.svg | 28 +- milstd2525/icons/ems/euopcd---------.svg | 28 +- milstd2525/icons/ems/euopce---------.svg | 28 +- milstd2525/icons/ems/euopd----------.svg | 28 +- milstd2525/icons/ems/euopda---------.svg | 28 +- milstd2525/icons/ems/euopdb---------.svg | 28 +- milstd2525/icons/ems/euopdc---------.svg | 28 +- milstd2525/icons/ems/euopdd---------.svg | 28 +- milstd2525/icons/ems/euopdda--------.svg | 28 +- milstd2525/icons/ems/euopddb--------.svg | 28 +- milstd2525/icons/ems/euopddc--------.svg | 28 +- milstd2525/icons/ems/euopde---------.svg | 28 +- milstd2525/icons/ems/euopdea--------.svg | 28 +- milstd2525/icons/ems/euopdeb--------.svg | 28 +- milstd2525/icons/ems/euopdec--------.svg | 28 +- milstd2525/icons/ems/euopdf---------.svg | 28 +- milstd2525/icons/ems/euopdfa--------.svg | 28 +- milstd2525/icons/ems/euopdfb--------.svg | 28 +- milstd2525/icons/ems/euopdfc--------.svg | 28 +- milstd2525/icons/ems/euopdg---------.svg | 28 +- milstd2525/icons/ems/euopdga--------.svg | 28 +- milstd2525/icons/ems/euopdgb--------.svg | 28 +- milstd2525/icons/ems/euopdgc--------.svg | 28 +- milstd2525/icons/ems/euopdh---------.svg | 28 +- milstd2525/icons/ems/euopdha--------.svg | 28 +- milstd2525/icons/ems/euopdhb--------.svg | 28 +- milstd2525/icons/ems/euopdhc--------.svg | 28 +- milstd2525/icons/ems/euopdi---------.svg | 28 +- milstd2525/icons/ems/euopdia--------.svg | 28 +- milstd2525/icons/ems/euopdib--------.svg | 28 +- milstd2525/icons/ems/euopdic--------.svg | 28 +- milstd2525/icons/ems/euopdj---------.svg | 28 +- milstd2525/icons/ems/euopdjb--------.svg | 28 +- milstd2525/icons/ems/euopdjc--------.svg | 28 +- milstd2525/icons/ems/euopdk---------.svg | 28 +- milstd2525/icons/ems/euopdl---------.svg | 28 +- milstd2525/icons/ems/euopdla--------.svg | 28 +- milstd2525/icons/ems/euopdlb--------.svg | 28 +- milstd2525/icons/ems/euopdlc--------.svg | 28 +- milstd2525/icons/ems/euopdm---------.svg | 28 +- milstd2525/icons/ems/euopdma--------.svg | 28 +- milstd2525/icons/ems/euopdmb--------.svg | 28 +- milstd2525/icons/ems/euopdmc--------.svg | 28 +- milstd2525/icons/ems/euopdn---------.svg | 28 +- milstd2525/icons/ems/euopdna--------.svg | 28 +- milstd2525/icons/ems/euopdnc--------.svg | 28 +- milstd2525/icons/ems/euopdo---------.svg | 28 +- milstd2525/icons/ems/euopdoa--------.svg | 28 +- milstd2525/icons/ems/euopdob--------.svg | 28 +- milstd2525/icons/ems/euopdoc--------.svg | 28 +- milstd2525/icons/ems/euopea---------.svg | 28 +- milstd2525/icons/ems/euopeb---------.svg | 28 +- milstd2525/icons/ems/euopec---------.svg | 28 +- milstd2525/icons/ems/euoped---------.svg | 28 +- milstd2525/icons/ems/euopee---------.svg | 28 +- milstd2525/icons/sigint/if-------------.svg | 28 +- milstd2525/icons/sigint/ifaa-----------.svg | 28 +- milstd2525/icons/sigint/ifaas----------.svg | 28 +- milstd2525/icons/sigint/ifaasc---------.svg | 28 +- milstd2525/icons/sigint/ifaascc--------.svg | 28 +- milstd2525/icons/sigint/ifaasco--------.svg | 28 +- milstd2525/icons/sigint/ifaascp--------.svg | 28 +- milstd2525/icons/sigint/ifaascs--------.svg | 28 +- milstd2525/icons/sigint/ifaasr---------.svg | 28 +- milstd2525/icons/sigint/ifaasrai-------.svg | 28 +- milstd2525/icons/sigint/ifaasras-------.svg | 28 +- milstd2525/icons/sigint/ifaasrc--------.svg | 28 +- milstd2525/icons/sigint/ifaasrd--------.svg | 28 +- milstd2525/icons/sigint/ifaasre--------.svg | 28 +- milstd2525/icons/sigint/ifaasrf--------.svg | 28 +- milstd2525/icons/sigint/ifaasri--------.svg | 28 +- milstd2525/icons/sigint/ifaasrma-------.svg | 28 +- milstd2525/icons/sigint/ifaasrmd-------.svg | 28 +- milstd2525/icons/sigint/ifaasrmf-------.svg | 28 +- milstd2525/icons/sigint/ifaasrmg-------.svg | 28 +- milstd2525/icons/sigint/ifaasrmt-------.svg | 28 +- milstd2525/icons/sigint/ifaasrta-------.svg | 28 +- milstd2525/icons/sigint/ifaasrti-------.svg | 28 +- milstd2525/icons/sigint/ifaasrtt-------.svg | 28 +- milstd2525/icons/sigint/ifaasru--------.svg | 28 +- milstd2525/icons/sigint/ifap-----------.svg | 28 +- milstd2525/icons/sigint/ifaps----------.svg | 28 +- milstd2525/icons/sigint/ifapsc---------.svg | 28 +- milstd2525/icons/sigint/ifapscc--------.svg | 28 +- milstd2525/icons/sigint/ifapsco--------.svg | 28 +- milstd2525/icons/sigint/ifapscp--------.svg | 28 +- milstd2525/icons/sigint/ifapscs--------.svg | 28 +- milstd2525/icons/sigint/ifapsr---------.svg | 28 +- milstd2525/icons/sigint/ifapsrai-------.svg | 28 +- milstd2525/icons/sigint/ifapsras-------.svg | 28 +- milstd2525/icons/sigint/ifapsrc--------.svg | 28 +- milstd2525/icons/sigint/ifapsrd--------.svg | 28 +- milstd2525/icons/sigint/ifapsre--------.svg | 28 +- milstd2525/icons/sigint/ifapsrf--------.svg | 28 +- milstd2525/icons/sigint/ifapsri--------.svg | 28 +- milstd2525/icons/sigint/ifapsrma-------.svg | 28 +- milstd2525/icons/sigint/ifapsrmd-------.svg | 28 +- milstd2525/icons/sigint/ifapsrmf-------.svg | 28 +- milstd2525/icons/sigint/ifapsrmg-------.svg | 28 +- milstd2525/icons/sigint/ifapsrmt-------.svg | 28 +- milstd2525/icons/sigint/ifapsrta-------.svg | 28 +- milstd2525/icons/sigint/ifapsrti-------.svg | 28 +- milstd2525/icons/sigint/ifapsrtt-------.svg | 28 +- milstd2525/icons/sigint/ifapsru--------.svg | 28 +- milstd2525/icons/sigint/ifga-----------.svg | 28 +- milstd2525/icons/sigint/ifgas----------.svg | 28 +- milstd2525/icons/sigint/ifgasc---------.svg | 28 +- milstd2525/icons/sigint/ifgascc--------.svg | 28 +- milstd2525/icons/sigint/ifgasco--------.svg | 28 +- milstd2525/icons/sigint/ifgascp--------.svg | 28 +- milstd2525/icons/sigint/ifgascs--------.svg | 28 +- milstd2525/icons/sigint/ifgasct--------.svg | 28 +- milstd2525/icons/sigint/ifgasr---------.svg | 28 +- milstd2525/icons/sigint/ifgasraa-------.svg | 28 +- milstd2525/icons/sigint/ifgasrat-------.svg | 28 +- milstd2525/icons/sigint/ifgasrb--------.svg | 28 +- milstd2525/icons/sigint/ifgasrca-------.svg | 28 +- milstd2525/icons/sigint/ifgasrcs-------.svg | 28 +- milstd2525/icons/sigint/ifgasrd--------.svg | 28 +- milstd2525/icons/sigint/ifgasre--------.svg | 28 +- milstd2525/icons/sigint/ifgasrf--------.svg | 28 +- milstd2525/icons/sigint/ifgasrh--------.svg | 28 +- milstd2525/icons/sigint/ifgasri--------.svg | 28 +- milstd2525/icons/sigint/ifgasrma-------.svg | 28 +- milstd2525/icons/sigint/ifgasrmf-------.svg | 28 +- milstd2525/icons/sigint/ifgasrmg-------.svg | 28 +- milstd2525/icons/sigint/ifgasrmm-------.svg | 28 +- milstd2525/icons/sigint/ifgasrmt-------.svg | 28 +- milstd2525/icons/sigint/ifgasrs--------.svg | 28 +- milstd2525/icons/sigint/ifgasrta-------.svg | 28 +- milstd2525/icons/sigint/ifgasrti-------.svg | 28 +- milstd2525/icons/sigint/ifgasrtt-------.svg | 28 +- milstd2525/icons/sigint/ifgasru--------.svg | 28 +- milstd2525/icons/sigint/ifgp-----------.svg | 28 +- milstd2525/icons/sigint/ifgps----------.svg | 28 +- milstd2525/icons/sigint/ifgpsc---------.svg | 28 +- milstd2525/icons/sigint/ifgpscc--------.svg | 28 +- milstd2525/icons/sigint/ifgpsco--------.svg | 28 +- milstd2525/icons/sigint/ifgpscp--------.svg | 28 +- milstd2525/icons/sigint/ifgpscs--------.svg | 28 +- milstd2525/icons/sigint/ifgpsct--------.svg | 28 +- milstd2525/icons/sigint/ifgpsr---------.svg | 28 +- milstd2525/icons/sigint/ifgpsraa-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrat-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrb--------.svg | 28 +- milstd2525/icons/sigint/ifgpsrca-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrcs-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrd--------.svg | 28 +- milstd2525/icons/sigint/ifgpsre--------.svg | 28 +- milstd2525/icons/sigint/ifgpsrf--------.svg | 28 +- milstd2525/icons/sigint/ifgpsrh--------.svg | 28 +- milstd2525/icons/sigint/ifgpsri--------.svg | 28 +- milstd2525/icons/sigint/ifgpsrma-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrmf-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrmg-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrmm-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrmt-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrs--------.svg | 28 +- milstd2525/icons/sigint/ifgpsrta-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrti-------.svg | 28 +- milstd2525/icons/sigint/ifgpsrtt-------.svg | 28 +- milstd2525/icons/sigint/ifgpsru--------.svg | 28 +- milstd2525/icons/sigint/ifpa-----------.svg | 28 +- milstd2525/icons/sigint/ifpas----------.svg | 28 +- milstd2525/icons/sigint/ifpasc---------.svg | 28 +- milstd2525/icons/sigint/ifpascd--------.svg | 28 +- milstd2525/icons/sigint/ifpasr---------.svg | 28 +- milstd2525/icons/sigint/ifpasrd--------.svg | 28 +- milstd2525/icons/sigint/ifpasre--------.svg | 28 +- milstd2525/icons/sigint/ifpasri--------.svg | 28 +- milstd2525/icons/sigint/ifpasrm--------.svg | 28 +- milstd2525/icons/sigint/ifpasrs--------.svg | 28 +- milstd2525/icons/sigint/ifpasrt--------.svg | 28 +- milstd2525/icons/sigint/ifpasru--------.svg | 28 +- milstd2525/icons/sigint/ifpp-----------.svg | 28 +- milstd2525/icons/sigint/ifpps----------.svg | 28 +- milstd2525/icons/sigint/ifppsc---------.svg | 28 +- milstd2525/icons/sigint/ifppscd--------.svg | 28 +- milstd2525/icons/sigint/ifppsr---------.svg | 28 +- milstd2525/icons/sigint/ifppsrd--------.svg | 28 +- milstd2525/icons/sigint/ifppsre--------.svg | 28 +- milstd2525/icons/sigint/ifppsri--------.svg | 28 +- milstd2525/icons/sigint/ifppsrm--------.svg | 28 +- milstd2525/icons/sigint/ifppsrs--------.svg | 28 +- milstd2525/icons/sigint/ifppsrt--------.svg | 28 +- milstd2525/icons/sigint/ifppsru--------.svg | 28 +- milstd2525/icons/sigint/ifsa-----------.svg | 28 +- milstd2525/icons/sigint/ifsas----------.svg | 28 +- milstd2525/icons/sigint/ifsasc---------.svg | 28 +- milstd2525/icons/sigint/ifsascc--------.svg | 28 +- milstd2525/icons/sigint/ifsasco--------.svg | 28 +- milstd2525/icons/sigint/ifsascp--------.svg | 28 +- milstd2525/icons/sigint/ifsascs--------.svg | 28 +- milstd2525/icons/sigint/ifsasr---------.svg | 28 +- milstd2525/icons/sigint/ifsasraa-------.svg | 28 +- milstd2525/icons/sigint/ifsasrat-------.svg | 28 +- milstd2525/icons/sigint/ifsasrca-------.svg | 28 +- milstd2525/icons/sigint/ifsasrci-------.svg | 28 +- milstd2525/icons/sigint/ifsasrd--------.svg | 28 +- milstd2525/icons/sigint/ifsasre--------.svg | 28 +- milstd2525/icons/sigint/ifsasrf--------.svg | 28 +- milstd2525/icons/sigint/ifsasrh--------.svg | 28 +- milstd2525/icons/sigint/ifsasri--------.svg | 28 +- milstd2525/icons/sigint/ifsasrma-------.svg | 28 +- milstd2525/icons/sigint/ifsasrmf-------.svg | 28 +- milstd2525/icons/sigint/ifsasrmg-------.svg | 28 +- milstd2525/icons/sigint/ifsasrmm-------.svg | 28 +- milstd2525/icons/sigint/ifsasrmt-------.svg | 28 +- milstd2525/icons/sigint/ifsasrs--------.svg | 28 +- milstd2525/icons/sigint/ifsasrta-------.svg | 28 +- milstd2525/icons/sigint/ifsasrti-------.svg | 28 +- milstd2525/icons/sigint/ifsasrtt-------.svg | 28 +- milstd2525/icons/sigint/ifsasru--------.svg | 28 +- milstd2525/icons/sigint/ifsp-----------.svg | 28 +- milstd2525/icons/sigint/ifsps----------.svg | 28 +- milstd2525/icons/sigint/ifspsc---------.svg | 28 +- milstd2525/icons/sigint/ifspscc--------.svg | 28 +- milstd2525/icons/sigint/ifspsco--------.svg | 28 +- milstd2525/icons/sigint/ifspscp--------.svg | 28 +- milstd2525/icons/sigint/ifspscs--------.svg | 28 +- milstd2525/icons/sigint/ifspsr---------.svg | 28 +- milstd2525/icons/sigint/ifspsraa-------.svg | 28 +- milstd2525/icons/sigint/ifspsrat-------.svg | 28 +- milstd2525/icons/sigint/ifspsrca-------.svg | 28 +- milstd2525/icons/sigint/ifspsrci-------.svg | 28 +- milstd2525/icons/sigint/ifspsrd--------.svg | 28 +- milstd2525/icons/sigint/ifspsre--------.svg | 28 +- milstd2525/icons/sigint/ifspsrf--------.svg | 28 +- milstd2525/icons/sigint/ifspsrh--------.svg | 28 +- milstd2525/icons/sigint/ifspsri--------.svg | 28 +- milstd2525/icons/sigint/ifspsrma-------.svg | 28 +- milstd2525/icons/sigint/ifspsrmf-------.svg | 28 +- milstd2525/icons/sigint/ifspsrmg-------.svg | 28 +- milstd2525/icons/sigint/ifspsrmm-------.svg | 28 +- milstd2525/icons/sigint/ifspsrmt-------.svg | 28 +- milstd2525/icons/sigint/ifspsrs--------.svg | 28 +- milstd2525/icons/sigint/ifspsrta-------.svg | 28 +- milstd2525/icons/sigint/ifspsrti-------.svg | 28 +- milstd2525/icons/sigint/ifspsrtt-------.svg | 28 +- milstd2525/icons/sigint/ifspsru--------.svg | 28 +- milstd2525/icons/sigint/ifua-----------.svg | 28 +- milstd2525/icons/sigint/ifuas----------.svg | 28 +- milstd2525/icons/sigint/ifuasc---------.svg | 28 +- milstd2525/icons/sigint/ifuasco--------.svg | 28 +- milstd2525/icons/sigint/ifuascp--------.svg | 28 +- milstd2525/icons/sigint/ifuascs--------.svg | 28 +- milstd2525/icons/sigint/ifuasr---------.svg | 28 +- milstd2525/icons/sigint/ifuasrd--------.svg | 28 +- milstd2525/icons/sigint/ifuasre--------.svg | 28 +- milstd2525/icons/sigint/ifuasrm--------.svg | 28 +- milstd2525/icons/sigint/ifuasrs--------.svg | 28 +- milstd2525/icons/sigint/ifuasrt--------.svg | 28 +- milstd2525/icons/sigint/ifuasru--------.svg | 28 +- milstd2525/icons/sigint/ifup-----------.svg | 28 +- milstd2525/icons/sigint/ifups----------.svg | 28 +- milstd2525/icons/sigint/ifupsc---------.svg | 28 +- milstd2525/icons/sigint/ifupsco--------.svg | 28 +- milstd2525/icons/sigint/ifupscp--------.svg | 28 +- milstd2525/icons/sigint/ifupscs--------.svg | 28 +- milstd2525/icons/sigint/ifupsr---------.svg | 28 +- milstd2525/icons/sigint/ifupsrd--------.svg | 28 +- milstd2525/icons/sigint/ifupsre--------.svg | 28 +- milstd2525/icons/sigint/ifupsrm--------.svg | 28 +- milstd2525/icons/sigint/ifupsrs--------.svg | 28 +- milstd2525/icons/sigint/ifupsrt--------.svg | 28 +- milstd2525/icons/sigint/ifupsru--------.svg | 28 +- milstd2525/icons/sigint/ih-------------.svg | 28 +- milstd2525/icons/sigint/ihaa-----------.svg | 28 +- milstd2525/icons/sigint/ihaas----------.svg | 28 +- milstd2525/icons/sigint/ihaasc---------.svg | 28 +- milstd2525/icons/sigint/ihaascc--------.svg | 28 +- milstd2525/icons/sigint/ihaasco--------.svg | 28 +- milstd2525/icons/sigint/ihaascp--------.svg | 28 +- milstd2525/icons/sigint/ihaascs--------.svg | 28 +- milstd2525/icons/sigint/ihaasr---------.svg | 28 +- milstd2525/icons/sigint/ihaasrai-------.svg | 28 +- milstd2525/icons/sigint/ihaasras-------.svg | 28 +- milstd2525/icons/sigint/ihaasrc--------.svg | 28 +- milstd2525/icons/sigint/ihaasrd--------.svg | 28 +- milstd2525/icons/sigint/ihaasre--------.svg | 28 +- milstd2525/icons/sigint/ihaasrf--------.svg | 28 +- milstd2525/icons/sigint/ihaasri--------.svg | 28 +- milstd2525/icons/sigint/ihaasrma-------.svg | 28 +- milstd2525/icons/sigint/ihaasrmd-------.svg | 28 +- milstd2525/icons/sigint/ihaasrmf-------.svg | 28 +- milstd2525/icons/sigint/ihaasrmg-------.svg | 28 +- milstd2525/icons/sigint/ihaasrmt-------.svg | 28 +- milstd2525/icons/sigint/ihaasrta-------.svg | 28 +- milstd2525/icons/sigint/ihaasrti-------.svg | 28 +- milstd2525/icons/sigint/ihaasrtt-------.svg | 28 +- milstd2525/icons/sigint/ihaasru--------.svg | 28 +- milstd2525/icons/sigint/ihap-----------.svg | 28 +- milstd2525/icons/sigint/ihaps----------.svg | 28 +- milstd2525/icons/sigint/ihapsc---------.svg | 28 +- milstd2525/icons/sigint/ihapscc--------.svg | 28 +- milstd2525/icons/sigint/ihapsco--------.svg | 28 +- milstd2525/icons/sigint/ihapscp--------.svg | 28 +- milstd2525/icons/sigint/ihapscs--------.svg | 28 +- milstd2525/icons/sigint/ihapsr---------.svg | 28 +- milstd2525/icons/sigint/ihapsrai-------.svg | 28 +- milstd2525/icons/sigint/ihapsras-------.svg | 28 +- milstd2525/icons/sigint/ihapsrc--------.svg | 28 +- milstd2525/icons/sigint/ihapsrd--------.svg | 28 +- milstd2525/icons/sigint/ihapsre--------.svg | 28 +- milstd2525/icons/sigint/ihapsrf--------.svg | 28 +- milstd2525/icons/sigint/ihapsri--------.svg | 28 +- milstd2525/icons/sigint/ihapsrma-------.svg | 28 +- milstd2525/icons/sigint/ihapsrmd-------.svg | 28 +- milstd2525/icons/sigint/ihapsrmf-------.svg | 28 +- milstd2525/icons/sigint/ihapsrmg-------.svg | 28 +- milstd2525/icons/sigint/ihapsrmt-------.svg | 28 +- milstd2525/icons/sigint/ihapsrta-------.svg | 28 +- milstd2525/icons/sigint/ihapsrti-------.svg | 28 +- milstd2525/icons/sigint/ihapsrtt-------.svg | 28 +- milstd2525/icons/sigint/ihapsru--------.svg | 28 +- milstd2525/icons/sigint/ihga-----------.svg | 28 +- milstd2525/icons/sigint/ihgas----------.svg | 28 +- milstd2525/icons/sigint/ihgasc---------.svg | 28 +- milstd2525/icons/sigint/ihgascc--------.svg | 28 +- milstd2525/icons/sigint/ihgasco--------.svg | 28 +- milstd2525/icons/sigint/ihgascp--------.svg | 28 +- milstd2525/icons/sigint/ihgascs--------.svg | 28 +- milstd2525/icons/sigint/ihgasct--------.svg | 28 +- milstd2525/icons/sigint/ihgasr---------.svg | 28 +- milstd2525/icons/sigint/ihgasraa-------.svg | 28 +- milstd2525/icons/sigint/ihgasrat-------.svg | 28 +- milstd2525/icons/sigint/ihgasrb--------.svg | 28 +- milstd2525/icons/sigint/ihgasrca-------.svg | 28 +- milstd2525/icons/sigint/ihgasrcs-------.svg | 28 +- milstd2525/icons/sigint/ihgasrd--------.svg | 28 +- milstd2525/icons/sigint/ihgasre--------.svg | 28 +- milstd2525/icons/sigint/ihgasrf--------.svg | 28 +- milstd2525/icons/sigint/ihgasrh--------.svg | 28 +- milstd2525/icons/sigint/ihgasri--------.svg | 28 +- milstd2525/icons/sigint/ihgasrma-------.svg | 28 +- milstd2525/icons/sigint/ihgasrmf-------.svg | 28 +- milstd2525/icons/sigint/ihgasrmg-------.svg | 28 +- milstd2525/icons/sigint/ihgasrmm-------.svg | 28 +- milstd2525/icons/sigint/ihgasrmt-------.svg | 28 +- milstd2525/icons/sigint/ihgasrs--------.svg | 28 +- milstd2525/icons/sigint/ihgasrta-------.svg | 28 +- milstd2525/icons/sigint/ihgasrti-------.svg | 28 +- milstd2525/icons/sigint/ihgasrtt-------.svg | 28 +- milstd2525/icons/sigint/ihgasru--------.svg | 28 +- milstd2525/icons/sigint/ihgp-----------.svg | 28 +- milstd2525/icons/sigint/ihgps----------.svg | 28 +- milstd2525/icons/sigint/ihgpsc---------.svg | 28 +- milstd2525/icons/sigint/ihgpscc--------.svg | 28 +- milstd2525/icons/sigint/ihgpsco--------.svg | 28 +- milstd2525/icons/sigint/ihgpscp--------.svg | 28 +- milstd2525/icons/sigint/ihgpscs--------.svg | 28 +- milstd2525/icons/sigint/ihgpsct--------.svg | 28 +- milstd2525/icons/sigint/ihgpsr---------.svg | 28 +- milstd2525/icons/sigint/ihgpsraa-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrat-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrb--------.svg | 28 +- milstd2525/icons/sigint/ihgpsrca-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrcs-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrd--------.svg | 28 +- milstd2525/icons/sigint/ihgpsre--------.svg | 28 +- milstd2525/icons/sigint/ihgpsrf--------.svg | 28 +- milstd2525/icons/sigint/ihgpsrh--------.svg | 28 +- milstd2525/icons/sigint/ihgpsri--------.svg | 28 +- milstd2525/icons/sigint/ihgpsrma-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrmf-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrmg-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrmm-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrmt-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrs--------.svg | 28 +- milstd2525/icons/sigint/ihgpsrta-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrti-------.svg | 28 +- milstd2525/icons/sigint/ihgpsrtt-------.svg | 28 +- milstd2525/icons/sigint/ihgpsru--------.svg | 28 +- milstd2525/icons/sigint/ihpa-----------.svg | 28 +- milstd2525/icons/sigint/ihpas----------.svg | 28 +- milstd2525/icons/sigint/ihpasc---------.svg | 28 +- milstd2525/icons/sigint/ihpascd--------.svg | 28 +- milstd2525/icons/sigint/ihpasr---------.svg | 28 +- milstd2525/icons/sigint/ihpasrd--------.svg | 28 +- milstd2525/icons/sigint/ihpasre--------.svg | 28 +- milstd2525/icons/sigint/ihpasri--------.svg | 28 +- milstd2525/icons/sigint/ihpasrm--------.svg | 28 +- milstd2525/icons/sigint/ihpasrs--------.svg | 28 +- milstd2525/icons/sigint/ihpasrt--------.svg | 28 +- milstd2525/icons/sigint/ihpasru--------.svg | 28 +- milstd2525/icons/sigint/ihpp-----------.svg | 28 +- milstd2525/icons/sigint/ihpps----------.svg | 28 +- milstd2525/icons/sigint/ihppsc---------.svg | 28 +- milstd2525/icons/sigint/ihppscd--------.svg | 28 +- milstd2525/icons/sigint/ihppsr---------.svg | 28 +- milstd2525/icons/sigint/ihppsrd--------.svg | 28 +- milstd2525/icons/sigint/ihppsre--------.svg | 28 +- milstd2525/icons/sigint/ihppsri--------.svg | 28 +- milstd2525/icons/sigint/ihppsrm--------.svg | 28 +- milstd2525/icons/sigint/ihppsrs--------.svg | 28 +- milstd2525/icons/sigint/ihppsrt--------.svg | 28 +- milstd2525/icons/sigint/ihppsru--------.svg | 28 +- milstd2525/icons/sigint/ihsa-----------.svg | 28 +- milstd2525/icons/sigint/ihsas----------.svg | 28 +- milstd2525/icons/sigint/ihsasc---------.svg | 28 +- milstd2525/icons/sigint/ihsascc--------.svg | 28 +- milstd2525/icons/sigint/ihsasco--------.svg | 28 +- milstd2525/icons/sigint/ihsascp--------.svg | 28 +- milstd2525/icons/sigint/ihsascs--------.svg | 28 +- milstd2525/icons/sigint/ihsasr---------.svg | 28 +- milstd2525/icons/sigint/ihsasraa-------.svg | 28 +- milstd2525/icons/sigint/ihsasrat-------.svg | 28 +- milstd2525/icons/sigint/ihsasrca-------.svg | 28 +- milstd2525/icons/sigint/ihsasrci-------.svg | 28 +- milstd2525/icons/sigint/ihsasrd--------.svg | 28 +- milstd2525/icons/sigint/ihsasre--------.svg | 28 +- milstd2525/icons/sigint/ihsasrf--------.svg | 28 +- milstd2525/icons/sigint/ihsasrh--------.svg | 28 +- milstd2525/icons/sigint/ihsasri--------.svg | 28 +- milstd2525/icons/sigint/ihsasrma-------.svg | 28 +- milstd2525/icons/sigint/ihsasrmf-------.svg | 28 +- milstd2525/icons/sigint/ihsasrmg-------.svg | 28 +- milstd2525/icons/sigint/ihsasrmm-------.svg | 28 +- milstd2525/icons/sigint/ihsasrmt-------.svg | 28 +- milstd2525/icons/sigint/ihsasrs--------.svg | 28 +- milstd2525/icons/sigint/ihsasrta-------.svg | 28 +- milstd2525/icons/sigint/ihsasrti-------.svg | 28 +- milstd2525/icons/sigint/ihsasrtt-------.svg | 28 +- milstd2525/icons/sigint/ihsasru--------.svg | 28 +- milstd2525/icons/sigint/ihsp-----------.svg | 28 +- milstd2525/icons/sigint/ihsps----------.svg | 28 +- milstd2525/icons/sigint/ihspsc---------.svg | 28 +- milstd2525/icons/sigint/ihspscc--------.svg | 28 +- milstd2525/icons/sigint/ihspsco--------.svg | 28 +- milstd2525/icons/sigint/ihspscp--------.svg | 28 +- milstd2525/icons/sigint/ihspscs--------.svg | 28 +- milstd2525/icons/sigint/ihspsr---------.svg | 28 +- milstd2525/icons/sigint/ihspsraa-------.svg | 28 +- milstd2525/icons/sigint/ihspsrat-------.svg | 28 +- milstd2525/icons/sigint/ihspsrca-------.svg | 28 +- milstd2525/icons/sigint/ihspsrci-------.svg | 28 +- milstd2525/icons/sigint/ihspsrd--------.svg | 28 +- milstd2525/icons/sigint/ihspsre--------.svg | 28 +- milstd2525/icons/sigint/ihspsrf--------.svg | 28 +- milstd2525/icons/sigint/ihspsrh--------.svg | 28 +- milstd2525/icons/sigint/ihspsri--------.svg | 28 +- milstd2525/icons/sigint/ihspsrma-------.svg | 28 +- milstd2525/icons/sigint/ihspsrmf-------.svg | 28 +- milstd2525/icons/sigint/ihspsrmg-------.svg | 28 +- milstd2525/icons/sigint/ihspsrmm-------.svg | 28 +- milstd2525/icons/sigint/ihspsrmt-------.svg | 28 +- milstd2525/icons/sigint/ihspsrs--------.svg | 28 +- milstd2525/icons/sigint/ihspsrta-------.svg | 28 +- milstd2525/icons/sigint/ihspsrti-------.svg | 28 +- milstd2525/icons/sigint/ihspsrtt-------.svg | 28 +- milstd2525/icons/sigint/ihspsru--------.svg | 28 +- milstd2525/icons/sigint/ihua-----------.svg | 28 +- milstd2525/icons/sigint/ihuas----------.svg | 28 +- milstd2525/icons/sigint/ihuasc---------.svg | 28 +- milstd2525/icons/sigint/ihuasco--------.svg | 28 +- milstd2525/icons/sigint/ihuascp--------.svg | 28 +- milstd2525/icons/sigint/ihuascs--------.svg | 28 +- milstd2525/icons/sigint/ihuasr---------.svg | 28 +- milstd2525/icons/sigint/ihuasrd--------.svg | 28 +- milstd2525/icons/sigint/ihuasre--------.svg | 28 +- milstd2525/icons/sigint/ihuasrm--------.svg | 28 +- milstd2525/icons/sigint/ihuasrs--------.svg | 28 +- milstd2525/icons/sigint/ihuasrt--------.svg | 28 +- milstd2525/icons/sigint/ihuasru--------.svg | 28 +- milstd2525/icons/sigint/ihup-----------.svg | 28 +- milstd2525/icons/sigint/ihups----------.svg | 28 +- milstd2525/icons/sigint/ihupsc---------.svg | 28 +- milstd2525/icons/sigint/ihupsco--------.svg | 28 +- milstd2525/icons/sigint/ihupscp--------.svg | 28 +- milstd2525/icons/sigint/ihupscs--------.svg | 28 +- milstd2525/icons/sigint/ihupsr---------.svg | 28 +- milstd2525/icons/sigint/ihupsrd--------.svg | 28 +- milstd2525/icons/sigint/ihupsre--------.svg | 28 +- milstd2525/icons/sigint/ihupsrm--------.svg | 28 +- milstd2525/icons/sigint/ihupsrs--------.svg | 28 +- milstd2525/icons/sigint/ihupsrt--------.svg | 28 +- milstd2525/icons/sigint/ihupsru--------.svg | 28 +- milstd2525/icons/sigint/in-------------.svg | 28 +- milstd2525/icons/sigint/inaa-----------.svg | 28 +- milstd2525/icons/sigint/inaas----------.svg | 28 +- milstd2525/icons/sigint/inaasc---------.svg | 28 +- milstd2525/icons/sigint/inaascc--------.svg | 28 +- milstd2525/icons/sigint/inaasco--------.svg | 28 +- milstd2525/icons/sigint/inaascp--------.svg | 28 +- milstd2525/icons/sigint/inaascs--------.svg | 28 +- milstd2525/icons/sigint/inaasr---------.svg | 28 +- milstd2525/icons/sigint/inaasrai-------.svg | 28 +- milstd2525/icons/sigint/inaasras-------.svg | 28 +- milstd2525/icons/sigint/inaasrc--------.svg | 28 +- milstd2525/icons/sigint/inaasrd--------.svg | 28 +- milstd2525/icons/sigint/inaasre--------.svg | 28 +- milstd2525/icons/sigint/inaasrf--------.svg | 28 +- milstd2525/icons/sigint/inaasri--------.svg | 28 +- milstd2525/icons/sigint/inaasrma-------.svg | 28 +- milstd2525/icons/sigint/inaasrmd-------.svg | 28 +- milstd2525/icons/sigint/inaasrmf-------.svg | 28 +- milstd2525/icons/sigint/inaasrmg-------.svg | 28 +- milstd2525/icons/sigint/inaasrmt-------.svg | 28 +- milstd2525/icons/sigint/inaasrta-------.svg | 28 +- milstd2525/icons/sigint/inaasrti-------.svg | 28 +- milstd2525/icons/sigint/inaasrtt-------.svg | 28 +- milstd2525/icons/sigint/inaasru--------.svg | 28 +- milstd2525/icons/sigint/inap-----------.svg | 28 +- milstd2525/icons/sigint/inaps----------.svg | 28 +- milstd2525/icons/sigint/inapsc---------.svg | 28 +- milstd2525/icons/sigint/inapscc--------.svg | 28 +- milstd2525/icons/sigint/inapsco--------.svg | 28 +- milstd2525/icons/sigint/inapscp--------.svg | 28 +- milstd2525/icons/sigint/inapscs--------.svg | 28 +- milstd2525/icons/sigint/inapsr---------.svg | 28 +- milstd2525/icons/sigint/inapsrai-------.svg | 28 +- milstd2525/icons/sigint/inapsras-------.svg | 28 +- milstd2525/icons/sigint/inapsrc--------.svg | 28 +- milstd2525/icons/sigint/inapsrd--------.svg | 28 +- milstd2525/icons/sigint/inapsre--------.svg | 28 +- milstd2525/icons/sigint/inapsrf--------.svg | 28 +- milstd2525/icons/sigint/inapsri--------.svg | 28 +- milstd2525/icons/sigint/inapsrma-------.svg | 28 +- milstd2525/icons/sigint/inapsrmd-------.svg | 28 +- milstd2525/icons/sigint/inapsrmf-------.svg | 28 +- milstd2525/icons/sigint/inapsrmg-------.svg | 28 +- milstd2525/icons/sigint/inapsrmt-------.svg | 28 +- milstd2525/icons/sigint/inapsrta-------.svg | 28 +- milstd2525/icons/sigint/inapsrti-------.svg | 28 +- milstd2525/icons/sigint/inapsrtt-------.svg | 28 +- milstd2525/icons/sigint/inapsru--------.svg | 28 +- milstd2525/icons/sigint/inga-----------.svg | 28 +- milstd2525/icons/sigint/ingas----------.svg | 28 +- milstd2525/icons/sigint/ingasc---------.svg | 28 +- milstd2525/icons/sigint/ingascc--------.svg | 28 +- milstd2525/icons/sigint/ingasco--------.svg | 28 +- milstd2525/icons/sigint/ingascp--------.svg | 28 +- milstd2525/icons/sigint/ingascs--------.svg | 28 +- milstd2525/icons/sigint/ingasct--------.svg | 28 +- milstd2525/icons/sigint/ingasr---------.svg | 28 +- milstd2525/icons/sigint/ingasraa-------.svg | 28 +- milstd2525/icons/sigint/ingasrat-------.svg | 28 +- milstd2525/icons/sigint/ingasrb--------.svg | 28 +- milstd2525/icons/sigint/ingasrca-------.svg | 28 +- milstd2525/icons/sigint/ingasrcs-------.svg | 28 +- milstd2525/icons/sigint/ingasrd--------.svg | 28 +- milstd2525/icons/sigint/ingasre--------.svg | 28 +- milstd2525/icons/sigint/ingasrf--------.svg | 28 +- milstd2525/icons/sigint/ingasrh--------.svg | 28 +- milstd2525/icons/sigint/ingasri--------.svg | 28 +- milstd2525/icons/sigint/ingasrma-------.svg | 28 +- milstd2525/icons/sigint/ingasrmf-------.svg | 28 +- milstd2525/icons/sigint/ingasrmg-------.svg | 28 +- milstd2525/icons/sigint/ingasrmm-------.svg | 28 +- milstd2525/icons/sigint/ingasrmt-------.svg | 28 +- milstd2525/icons/sigint/ingasrs--------.svg | 28 +- milstd2525/icons/sigint/ingasrta-------.svg | 28 +- milstd2525/icons/sigint/ingasrti-------.svg | 28 +- milstd2525/icons/sigint/ingasrtt-------.svg | 28 +- milstd2525/icons/sigint/ingasru--------.svg | 28 +- milstd2525/icons/sigint/ingp-----------.svg | 28 +- milstd2525/icons/sigint/ingps----------.svg | 28 +- milstd2525/icons/sigint/ingpsc---------.svg | 28 +- milstd2525/icons/sigint/ingpscc--------.svg | 28 +- milstd2525/icons/sigint/ingpsco--------.svg | 28 +- milstd2525/icons/sigint/ingpscp--------.svg | 28 +- milstd2525/icons/sigint/ingpscs--------.svg | 28 +- milstd2525/icons/sigint/ingpsct--------.svg | 28 +- milstd2525/icons/sigint/ingpsr---------.svg | 28 +- milstd2525/icons/sigint/ingpsraa-------.svg | 28 +- milstd2525/icons/sigint/ingpsrat-------.svg | 28 +- milstd2525/icons/sigint/ingpsrb--------.svg | 28 +- milstd2525/icons/sigint/ingpsrca-------.svg | 28 +- milstd2525/icons/sigint/ingpsrcs-------.svg | 28 +- milstd2525/icons/sigint/ingpsrd--------.svg | 28 +- milstd2525/icons/sigint/ingpsre--------.svg | 28 +- milstd2525/icons/sigint/ingpsrf--------.svg | 28 +- milstd2525/icons/sigint/ingpsrh--------.svg | 28 +- milstd2525/icons/sigint/ingpsri--------.svg | 28 +- milstd2525/icons/sigint/ingpsrma-------.svg | 28 +- milstd2525/icons/sigint/ingpsrmf-------.svg | 28 +- milstd2525/icons/sigint/ingpsrmg-------.svg | 28 +- milstd2525/icons/sigint/ingpsrmm-------.svg | 28 +- milstd2525/icons/sigint/ingpsrmt-------.svg | 28 +- milstd2525/icons/sigint/ingpsrs--------.svg | 28 +- milstd2525/icons/sigint/ingpsrta-------.svg | 28 +- milstd2525/icons/sigint/ingpsrti-------.svg | 28 +- milstd2525/icons/sigint/ingpsrtt-------.svg | 28 +- milstd2525/icons/sigint/ingpsru--------.svg | 28 +- milstd2525/icons/sigint/inpa-----------.svg | 28 +- milstd2525/icons/sigint/inpas----------.svg | 28 +- milstd2525/icons/sigint/inpasc---------.svg | 28 +- milstd2525/icons/sigint/inpascd--------.svg | 28 +- milstd2525/icons/sigint/inpasr---------.svg | 28 +- milstd2525/icons/sigint/inpasrd--------.svg | 28 +- milstd2525/icons/sigint/inpasre--------.svg | 28 +- milstd2525/icons/sigint/inpasri--------.svg | 28 +- milstd2525/icons/sigint/inpasrm--------.svg | 28 +- milstd2525/icons/sigint/inpasrs--------.svg | 28 +- milstd2525/icons/sigint/inpasrt--------.svg | 28 +- milstd2525/icons/sigint/inpasru--------.svg | 28 +- milstd2525/icons/sigint/inpp-----------.svg | 28 +- milstd2525/icons/sigint/inpps----------.svg | 28 +- milstd2525/icons/sigint/inppsc---------.svg | 28 +- milstd2525/icons/sigint/inppscd--------.svg | 28 +- milstd2525/icons/sigint/inppsr---------.svg | 28 +- milstd2525/icons/sigint/inppsrd--------.svg | 28 +- milstd2525/icons/sigint/inppsre--------.svg | 28 +- milstd2525/icons/sigint/inppsri--------.svg | 28 +- milstd2525/icons/sigint/inppsrm--------.svg | 28 +- milstd2525/icons/sigint/inppsrs--------.svg | 28 +- milstd2525/icons/sigint/inppsrt--------.svg | 28 +- milstd2525/icons/sigint/inppsru--------.svg | 28 +- milstd2525/icons/sigint/insa-----------.svg | 28 +- milstd2525/icons/sigint/insas----------.svg | 28 +- milstd2525/icons/sigint/insasc---------.svg | 28 +- milstd2525/icons/sigint/insascc--------.svg | 28 +- milstd2525/icons/sigint/insasco--------.svg | 28 +- milstd2525/icons/sigint/insascp--------.svg | 28 +- milstd2525/icons/sigint/insascs--------.svg | 28 +- milstd2525/icons/sigint/insasr---------.svg | 28 +- milstd2525/icons/sigint/insasraa-------.svg | 28 +- milstd2525/icons/sigint/insasrat-------.svg | 28 +- milstd2525/icons/sigint/insasrca-------.svg | 28 +- milstd2525/icons/sigint/insasrci-------.svg | 28 +- milstd2525/icons/sigint/insasrd--------.svg | 28 +- milstd2525/icons/sigint/insasre--------.svg | 28 +- milstd2525/icons/sigint/insasrf--------.svg | 28 +- milstd2525/icons/sigint/insasrh--------.svg | 28 +- milstd2525/icons/sigint/insasri--------.svg | 28 +- milstd2525/icons/sigint/insasrma-------.svg | 28 +- milstd2525/icons/sigint/insasrmf-------.svg | 28 +- milstd2525/icons/sigint/insasrmg-------.svg | 28 +- milstd2525/icons/sigint/insasrmm-------.svg | 28 +- milstd2525/icons/sigint/insasrmt-------.svg | 28 +- milstd2525/icons/sigint/insasrs--------.svg | 28 +- milstd2525/icons/sigint/insasrta-------.svg | 28 +- milstd2525/icons/sigint/insasrti-------.svg | 28 +- milstd2525/icons/sigint/insasrtt-------.svg | 28 +- milstd2525/icons/sigint/insasru--------.svg | 28 +- milstd2525/icons/sigint/insp-----------.svg | 28 +- milstd2525/icons/sigint/insps----------.svg | 28 +- milstd2525/icons/sigint/inspsc---------.svg | 28 +- milstd2525/icons/sigint/inspscc--------.svg | 28 +- milstd2525/icons/sigint/inspsco--------.svg | 28 +- milstd2525/icons/sigint/inspscp--------.svg | 28 +- milstd2525/icons/sigint/inspscs--------.svg | 28 +- milstd2525/icons/sigint/inspsr---------.svg | 28 +- milstd2525/icons/sigint/inspsraa-------.svg | 28 +- milstd2525/icons/sigint/inspsrat-------.svg | 28 +- milstd2525/icons/sigint/inspsrca-------.svg | 28 +- milstd2525/icons/sigint/inspsrci-------.svg | 28 +- milstd2525/icons/sigint/inspsrd--------.svg | 28 +- milstd2525/icons/sigint/inspsre--------.svg | 28 +- milstd2525/icons/sigint/inspsrf--------.svg | 28 +- milstd2525/icons/sigint/inspsrh--------.svg | 28 +- milstd2525/icons/sigint/inspsri--------.svg | 28 +- milstd2525/icons/sigint/inspsrma-------.svg | 28 +- milstd2525/icons/sigint/inspsrmf-------.svg | 28 +- milstd2525/icons/sigint/inspsrmg-------.svg | 28 +- milstd2525/icons/sigint/inspsrmm-------.svg | 28 +- milstd2525/icons/sigint/inspsrmt-------.svg | 28 +- milstd2525/icons/sigint/inspsrs--------.svg | 28 +- milstd2525/icons/sigint/inspsrta-------.svg | 28 +- milstd2525/icons/sigint/inspsrti-------.svg | 28 +- milstd2525/icons/sigint/inspsrtt-------.svg | 28 +- milstd2525/icons/sigint/inspsru--------.svg | 28 +- milstd2525/icons/sigint/inua-----------.svg | 28 +- milstd2525/icons/sigint/inuas----------.svg | 28 +- milstd2525/icons/sigint/inuasc---------.svg | 28 +- milstd2525/icons/sigint/inuasco--------.svg | 28 +- milstd2525/icons/sigint/inuascp--------.svg | 28 +- milstd2525/icons/sigint/inuascs--------.svg | 28 +- milstd2525/icons/sigint/inuasr---------.svg | 28 +- milstd2525/icons/sigint/inuasrd--------.svg | 28 +- milstd2525/icons/sigint/inuasre--------.svg | 28 +- milstd2525/icons/sigint/inuasrm--------.svg | 28 +- milstd2525/icons/sigint/inuasrs--------.svg | 28 +- milstd2525/icons/sigint/inuasrt--------.svg | 28 +- milstd2525/icons/sigint/inuasru--------.svg | 28 +- milstd2525/icons/sigint/inup-----------.svg | 28 +- milstd2525/icons/sigint/inups----------.svg | 28 +- milstd2525/icons/sigint/inupsc---------.svg | 28 +- milstd2525/icons/sigint/inupsco--------.svg | 28 +- milstd2525/icons/sigint/inupscp--------.svg | 28 +- milstd2525/icons/sigint/inupscs--------.svg | 28 +- milstd2525/icons/sigint/inupsr---------.svg | 28 +- milstd2525/icons/sigint/inupsrd--------.svg | 28 +- milstd2525/icons/sigint/inupsre--------.svg | 28 +- milstd2525/icons/sigint/inupsrm--------.svg | 28 +- milstd2525/icons/sigint/inupsrs--------.svg | 28 +- milstd2525/icons/sigint/inupsrt--------.svg | 28 +- milstd2525/icons/sigint/inupsru--------.svg | 28 +- milstd2525/icons/sigint/iu-------------.svg | 28 +- milstd2525/icons/sigint/iuaa-----------.svg | 28 +- milstd2525/icons/sigint/iuaas----------.svg | 28 +- milstd2525/icons/sigint/iuaasc---------.svg | 28 +- milstd2525/icons/sigint/iuaascc--------.svg | 28 +- milstd2525/icons/sigint/iuaasco--------.svg | 28 +- milstd2525/icons/sigint/iuaascp--------.svg | 28 +- milstd2525/icons/sigint/iuaascs--------.svg | 28 +- milstd2525/icons/sigint/iuaasr---------.svg | 28 +- milstd2525/icons/sigint/iuaasrai-------.svg | 28 +- milstd2525/icons/sigint/iuaasras-------.svg | 28 +- milstd2525/icons/sigint/iuaasrc--------.svg | 28 +- milstd2525/icons/sigint/iuaasrd--------.svg | 28 +- milstd2525/icons/sigint/iuaasre--------.svg | 28 +- milstd2525/icons/sigint/iuaasrf--------.svg | 28 +- milstd2525/icons/sigint/iuaasri--------.svg | 28 +- milstd2525/icons/sigint/iuaasrma-------.svg | 28 +- milstd2525/icons/sigint/iuaasrmd-------.svg | 28 +- milstd2525/icons/sigint/iuaasrmf-------.svg | 28 +- milstd2525/icons/sigint/iuaasrmg-------.svg | 28 +- milstd2525/icons/sigint/iuaasrmt-------.svg | 28 +- milstd2525/icons/sigint/iuaasrta-------.svg | 28 +- milstd2525/icons/sigint/iuaasrti-------.svg | 28 +- milstd2525/icons/sigint/iuaasrtt-------.svg | 28 +- milstd2525/icons/sigint/iuaasru--------.svg | 28 +- milstd2525/icons/sigint/iuap-----------.svg | 28 +- milstd2525/icons/sigint/iuaps----------.svg | 28 +- milstd2525/icons/sigint/iuapsc---------.svg | 28 +- milstd2525/icons/sigint/iuapscc--------.svg | 28 +- milstd2525/icons/sigint/iuapsco--------.svg | 28 +- milstd2525/icons/sigint/iuapscp--------.svg | 28 +- milstd2525/icons/sigint/iuapscs--------.svg | 28 +- milstd2525/icons/sigint/iuapsr---------.svg | 28 +- milstd2525/icons/sigint/iuapsrai-------.svg | 28 +- milstd2525/icons/sigint/iuapsras-------.svg | 28 +- milstd2525/icons/sigint/iuapsrc--------.svg | 28 +- milstd2525/icons/sigint/iuapsrd--------.svg | 28 +- milstd2525/icons/sigint/iuapsre--------.svg | 28 +- milstd2525/icons/sigint/iuapsrf--------.svg | 28 +- milstd2525/icons/sigint/iuapsri--------.svg | 28 +- milstd2525/icons/sigint/iuapsrma-------.svg | 28 +- milstd2525/icons/sigint/iuapsrmd-------.svg | 28 +- milstd2525/icons/sigint/iuapsrmf-------.svg | 28 +- milstd2525/icons/sigint/iuapsrmg-------.svg | 28 +- milstd2525/icons/sigint/iuapsrmt-------.svg | 28 +- milstd2525/icons/sigint/iuapsrta-------.svg | 28 +- milstd2525/icons/sigint/iuapsrti-------.svg | 28 +- milstd2525/icons/sigint/iuapsrtt-------.svg | 28 +- milstd2525/icons/sigint/iuapsru--------.svg | 28 +- milstd2525/icons/sigint/iuga-----------.svg | 28 +- milstd2525/icons/sigint/iugas----------.svg | 28 +- milstd2525/icons/sigint/iugasc---------.svg | 28 +- milstd2525/icons/sigint/iugascc--------.svg | 28 +- milstd2525/icons/sigint/iugasco--------.svg | 28 +- milstd2525/icons/sigint/iugascp--------.svg | 28 +- milstd2525/icons/sigint/iugascs--------.svg | 28 +- milstd2525/icons/sigint/iugasct--------.svg | 28 +- milstd2525/icons/sigint/iugasr---------.svg | 28 +- milstd2525/icons/sigint/iugasraa-------.svg | 28 +- milstd2525/icons/sigint/iugasrat-------.svg | 28 +- milstd2525/icons/sigint/iugasrb--------.svg | 28 +- milstd2525/icons/sigint/iugasrca-------.svg | 28 +- milstd2525/icons/sigint/iugasrcs-------.svg | 28 +- milstd2525/icons/sigint/iugasrd--------.svg | 28 +- milstd2525/icons/sigint/iugasre--------.svg | 28 +- milstd2525/icons/sigint/iugasrf--------.svg | 28 +- milstd2525/icons/sigint/iugasrh--------.svg | 28 +- milstd2525/icons/sigint/iugasri--------.svg | 28 +- milstd2525/icons/sigint/iugasrma-------.svg | 28 +- milstd2525/icons/sigint/iugasrmf-------.svg | 28 +- milstd2525/icons/sigint/iugasrmg-------.svg | 28 +- milstd2525/icons/sigint/iugasrmm-------.svg | 28 +- milstd2525/icons/sigint/iugasrmt-------.svg | 28 +- milstd2525/icons/sigint/iugasrs--------.svg | 28 +- milstd2525/icons/sigint/iugasrta-------.svg | 28 +- milstd2525/icons/sigint/iugasrti-------.svg | 28 +- milstd2525/icons/sigint/iugasrtt-------.svg | 28 +- milstd2525/icons/sigint/iugasru--------.svg | 28 +- milstd2525/icons/sigint/iugp-----------.svg | 28 +- milstd2525/icons/sigint/iugps----------.svg | 28 +- milstd2525/icons/sigint/iugpsc---------.svg | 28 +- milstd2525/icons/sigint/iugpscc--------.svg | 28 +- milstd2525/icons/sigint/iugpsco--------.svg | 28 +- milstd2525/icons/sigint/iugpscp--------.svg | 28 +- milstd2525/icons/sigint/iugpscs--------.svg | 28 +- milstd2525/icons/sigint/iugpsct--------.svg | 28 +- milstd2525/icons/sigint/iugpsr---------.svg | 28 +- milstd2525/icons/sigint/iugpsraa-------.svg | 28 +- milstd2525/icons/sigint/iugpsrat-------.svg | 28 +- milstd2525/icons/sigint/iugpsrb--------.svg | 28 +- milstd2525/icons/sigint/iugpsrca-------.svg | 28 +- milstd2525/icons/sigint/iugpsrcs-------.svg | 28 +- milstd2525/icons/sigint/iugpsrd--------.svg | 28 +- milstd2525/icons/sigint/iugpsre--------.svg | 28 +- milstd2525/icons/sigint/iugpsrf--------.svg | 28 +- milstd2525/icons/sigint/iugpsrh--------.svg | 28 +- milstd2525/icons/sigint/iugpsri--------.svg | 28 +- milstd2525/icons/sigint/iugpsrma-------.svg | 28 +- milstd2525/icons/sigint/iugpsrmf-------.svg | 28 +- milstd2525/icons/sigint/iugpsrmg-------.svg | 28 +- milstd2525/icons/sigint/iugpsrmm-------.svg | 28 +- milstd2525/icons/sigint/iugpsrmt-------.svg | 28 +- milstd2525/icons/sigint/iugpsrs--------.svg | 28 +- milstd2525/icons/sigint/iugpsrta-------.svg | 28 +- milstd2525/icons/sigint/iugpsrti-------.svg | 28 +- milstd2525/icons/sigint/iugpsrtt-------.svg | 28 +- milstd2525/icons/sigint/iugpsru--------.svg | 28 +- milstd2525/icons/sigint/iupa-----------.svg | 28 +- milstd2525/icons/sigint/iupas----------.svg | 28 +- milstd2525/icons/sigint/iupasc---------.svg | 28 +- milstd2525/icons/sigint/iupascd--------.svg | 28 +- milstd2525/icons/sigint/iupasr---------.svg | 28 +- milstd2525/icons/sigint/iupasrd--------.svg | 28 +- milstd2525/icons/sigint/iupasre--------.svg | 28 +- milstd2525/icons/sigint/iupasri--------.svg | 28 +- milstd2525/icons/sigint/iupasrm--------.svg | 28 +- milstd2525/icons/sigint/iupasrs--------.svg | 28 +- milstd2525/icons/sigint/iupasrt--------.svg | 28 +- milstd2525/icons/sigint/iupasru--------.svg | 28 +- milstd2525/icons/sigint/iupp-----------.svg | 28 +- milstd2525/icons/sigint/iupps----------.svg | 28 +- milstd2525/icons/sigint/iuppsc---------.svg | 28 +- milstd2525/icons/sigint/iuppscd--------.svg | 28 +- milstd2525/icons/sigint/iuppsr---------.svg | 28 +- milstd2525/icons/sigint/iuppsrd--------.svg | 28 +- milstd2525/icons/sigint/iuppsre--------.svg | 28 +- milstd2525/icons/sigint/iuppsri--------.svg | 28 +- milstd2525/icons/sigint/iuppsrm--------.svg | 28 +- milstd2525/icons/sigint/iuppsrs--------.svg | 28 +- milstd2525/icons/sigint/iuppsrt--------.svg | 28 +- milstd2525/icons/sigint/iuppsru--------.svg | 28 +- milstd2525/icons/sigint/iusa-----------.svg | 28 +- milstd2525/icons/sigint/iusas----------.svg | 28 +- milstd2525/icons/sigint/iusasc---------.svg | 28 +- milstd2525/icons/sigint/iusascc--------.svg | 28 +- milstd2525/icons/sigint/iusasco--------.svg | 28 +- milstd2525/icons/sigint/iusascp--------.svg | 28 +- milstd2525/icons/sigint/iusascs--------.svg | 28 +- milstd2525/icons/sigint/iusasr---------.svg | 28 +- milstd2525/icons/sigint/iusasraa-------.svg | 28 +- milstd2525/icons/sigint/iusasrat-------.svg | 28 +- milstd2525/icons/sigint/iusasrca-------.svg | 28 +- milstd2525/icons/sigint/iusasrci-------.svg | 28 +- milstd2525/icons/sigint/iusasrd--------.svg | 28 +- milstd2525/icons/sigint/iusasre--------.svg | 28 +- milstd2525/icons/sigint/iusasrf--------.svg | 28 +- milstd2525/icons/sigint/iusasrh--------.svg | 28 +- milstd2525/icons/sigint/iusasri--------.svg | 28 +- milstd2525/icons/sigint/iusasrma-------.svg | 28 +- milstd2525/icons/sigint/iusasrmf-------.svg | 28 +- milstd2525/icons/sigint/iusasrmg-------.svg | 28 +- milstd2525/icons/sigint/iusasrmm-------.svg | 28 +- milstd2525/icons/sigint/iusasrmt-------.svg | 28 +- milstd2525/icons/sigint/iusasrs--------.svg | 28 +- milstd2525/icons/sigint/iusasrta-------.svg | 28 +- milstd2525/icons/sigint/iusasrti-------.svg | 28 +- milstd2525/icons/sigint/iusasrtt-------.svg | 28 +- milstd2525/icons/sigint/iusasru--------.svg | 28 +- milstd2525/icons/sigint/iusp-----------.svg | 28 +- milstd2525/icons/sigint/iusps----------.svg | 28 +- milstd2525/icons/sigint/iuspsc---------.svg | 28 +- milstd2525/icons/sigint/iuspscc--------.svg | 28 +- milstd2525/icons/sigint/iuspsco--------.svg | 28 +- milstd2525/icons/sigint/iuspscp--------.svg | 28 +- milstd2525/icons/sigint/iuspscs--------.svg | 28 +- milstd2525/icons/sigint/iuspsr---------.svg | 28 +- milstd2525/icons/sigint/iuspsraa-------.svg | 28 +- milstd2525/icons/sigint/iuspsrat-------.svg | 28 +- milstd2525/icons/sigint/iuspsrca-------.svg | 28 +- milstd2525/icons/sigint/iuspsrci-------.svg | 28 +- milstd2525/icons/sigint/iuspsrd--------.svg | 28 +- milstd2525/icons/sigint/iuspsre--------.svg | 28 +- milstd2525/icons/sigint/iuspsrf--------.svg | 28 +- milstd2525/icons/sigint/iuspsrh--------.svg | 28 +- milstd2525/icons/sigint/iuspsri--------.svg | 28 +- milstd2525/icons/sigint/iuspsrma-------.svg | 28 +- milstd2525/icons/sigint/iuspsrmf-------.svg | 28 +- milstd2525/icons/sigint/iuspsrmg-------.svg | 28 +- milstd2525/icons/sigint/iuspsrmm-------.svg | 28 +- milstd2525/icons/sigint/iuspsrmt-------.svg | 28 +- milstd2525/icons/sigint/iuspsrs--------.svg | 28 +- milstd2525/icons/sigint/iuspsrta-------.svg | 28 +- milstd2525/icons/sigint/iuspsrti-------.svg | 28 +- milstd2525/icons/sigint/iuspsrtt-------.svg | 28 +- milstd2525/icons/sigint/iuspsru--------.svg | 28 +- milstd2525/icons/sigint/iuua-----------.svg | 28 +- milstd2525/icons/sigint/iuuas----------.svg | 28 +- milstd2525/icons/sigint/iuuasc---------.svg | 28 +- milstd2525/icons/sigint/iuuasco--------.svg | 28 +- milstd2525/icons/sigint/iuuascp--------.svg | 28 +- milstd2525/icons/sigint/iuuascs--------.svg | 28 +- milstd2525/icons/sigint/iuuasr---------.svg | 28 +- milstd2525/icons/sigint/iuuasrd--------.svg | 28 +- milstd2525/icons/sigint/iuuasre--------.svg | 28 +- milstd2525/icons/sigint/iuuasrm--------.svg | 28 +- milstd2525/icons/sigint/iuuasrs--------.svg | 28 +- milstd2525/icons/sigint/iuuasrt--------.svg | 28 +- milstd2525/icons/sigint/iuuasru--------.svg | 28 +- milstd2525/icons/sigint/iuup-----------.svg | 28 +- milstd2525/icons/sigint/iuups----------.svg | 28 +- milstd2525/icons/sigint/iuupsc---------.svg | 28 +- milstd2525/icons/sigint/iuupsco--------.svg | 28 +- milstd2525/icons/sigint/iuupscp--------.svg | 28 +- milstd2525/icons/sigint/iuupscs--------.svg | 28 +- milstd2525/icons/sigint/iuupsr---------.svg | 28 +- milstd2525/icons/sigint/iuupsrd--------.svg | 28 +- milstd2525/icons/sigint/iuupsre--------.svg | 28 +- milstd2525/icons/sigint/iuupsrm--------.svg | 28 +- milstd2525/icons/sigint/iuupsrs--------.svg | 28 +- milstd2525/icons/sigint/iuupsrt--------.svg | 28 +- milstd2525/icons/sigint/iuupsru--------.svg | 28 +- milstd2525/icons/stbops/ofga-----------.svg | 28 +- milstd2525/icons/stbops/ofgaa----------.svg | 28 +- milstd2525/icons/stbops/ofgab----------.svg | 28 +- milstd2525/icons/stbops/ofgac----------.svg | 28 +- milstd2525/icons/stbops/ofgad----------.svg | 28 +- milstd2525/icons/stbops/ofgae----------.svg | 28 +- milstd2525/icons/stbops/ofgaf----------.svg | 28 +- milstd2525/icons/stbops/ofgp-----------.svg | 28 +- milstd2525/icons/stbops/ofgpa----------.svg | 28 +- milstd2525/icons/stbops/ofgpb----------.svg | 28 +- milstd2525/icons/stbops/ofgpc----------.svg | 28 +- milstd2525/icons/stbops/ofgpd----------.svg | 28 +- milstd2525/icons/stbops/ofgpe----------.svg | 28 +- milstd2525/icons/stbops/ofgpf----------.svg | 28 +- milstd2525/icons/stbops/ofiad----------.svg | 28 +- milstd2525/icons/stbops/ofiaf----------.svg | 28 +- milstd2525/icons/stbops/ofiag----------.svg | 28 +- milstd2525/icons/stbops/ofiai----------.svg | 28 +- milstd2525/icons/stbops/ofiar----------.svg | 28 +- milstd2525/icons/stbops/ofias----------.svg | 28 +- milstd2525/icons/stbops/ofiav----------.svg | 28 +- milstd2525/icons/stbops/ofipd----------.svg | 28 +- milstd2525/icons/stbops/ofipf----------.svg | 28 +- milstd2525/icons/stbops/ofipg----------.svg | 28 +- milstd2525/icons/stbops/ofipi----------.svg | 28 +- milstd2525/icons/stbops/ofipr----------.svg | 28 +- milstd2525/icons/stbops/ofips----------.svg | 28 +- milstd2525/icons/stbops/ofipv----------.svg | 28 +- milstd2525/icons/stbops/oflab----------.svg | 28 +- milstd2525/icons/stbops/oflag----------.svg | 28 +- milstd2525/icons/stbops/oflam----------.svg | 28 +- milstd2525/icons/stbops/oflaw----------.svg | 28 +- milstd2525/icons/stbops/oflpb----------.svg | 28 +- milstd2525/icons/stbops/oflpg----------.svg | 28 +- milstd2525/icons/stbops/oflpm----------.svg | 28 +- milstd2525/icons/stbops/oflpw----------.svg | 28 +- milstd2525/icons/stbops/ofoaa----------.svg | 28 +- milstd2525/icons/stbops/ofoac----------.svg | 28 +- milstd2525/icons/stbops/ofoaca---------.svg | 28 +- milstd2525/icons/stbops/ofoacb---------.svg | 28 +- milstd2525/icons/stbops/ofoacc---------.svg | 28 +- milstd2525/icons/stbops/ofoad----------.svg | 28 +- milstd2525/icons/stbops/ofoae----------.svg | 28 +- milstd2525/icons/stbops/ofoaf----------.svg | 28 +- milstd2525/icons/stbops/ofoaha---------.svg | 28 +- milstd2525/icons/stbops/ofoaht---------.svg | 28 +- milstd2525/icons/stbops/ofoahv---------.svg | 28 +- milstd2525/icons/stbops/ofoak----------.svg | 28 +- milstd2525/icons/stbops/ofoaka---------.svg | 28 +- milstd2525/icons/stbops/ofoam----------.svg | 28 +- milstd2525/icons/stbops/ofoao----------.svg | 28 +- milstd2525/icons/stbops/ofoap----------.svg | 28 +- milstd2525/icons/stbops/ofoarc---------.svg | 28 +- milstd2525/icons/stbops/ofoarw---------.svg | 28 +- milstd2525/icons/stbops/ofoas----------.svg | 28 +- milstd2525/icons/stbops/ofoau----------.svg | 28 +- milstd2525/icons/stbops/ofoay----------.svg | 28 +- milstd2525/icons/stbops/ofoayh---------.svg | 28 +- milstd2525/icons/stbops/ofoayt---------.svg | 28 +- milstd2525/icons/stbops/ofoayw---------.svg | 28 +- milstd2525/icons/stbops/ofopa----------.svg | 28 +- milstd2525/icons/stbops/ofopc----------.svg | 28 +- milstd2525/icons/stbops/ofopca---------.svg | 28 +- milstd2525/icons/stbops/ofopcb---------.svg | 28 +- milstd2525/icons/stbops/ofopcc---------.svg | 28 +- milstd2525/icons/stbops/ofopd----------.svg | 28 +- milstd2525/icons/stbops/ofope----------.svg | 28 +- milstd2525/icons/stbops/ofopf----------.svg | 28 +- milstd2525/icons/stbops/ofopha---------.svg | 28 +- milstd2525/icons/stbops/ofopht---------.svg | 28 +- milstd2525/icons/stbops/ofophv---------.svg | 28 +- milstd2525/icons/stbops/ofopk----------.svg | 28 +- milstd2525/icons/stbops/ofopka---------.svg | 28 +- milstd2525/icons/stbops/ofopm----------.svg | 28 +- milstd2525/icons/stbops/ofopo----------.svg | 28 +- milstd2525/icons/stbops/ofopp----------.svg | 28 +- milstd2525/icons/stbops/ofoprc---------.svg | 28 +- milstd2525/icons/stbops/ofoprw---------.svg | 28 +- milstd2525/icons/stbops/ofops----------.svg | 28 +- milstd2525/icons/stbops/ofopu----------.svg | 28 +- milstd2525/icons/stbops/ofopy----------.svg | 28 +- milstd2525/icons/stbops/ofopyh---------.svg | 28 +- milstd2525/icons/stbops/ofopyt---------.svg | 28 +- milstd2525/icons/stbops/ofopyw---------.svg | 28 +- milstd2525/icons/stbops/ofpa-----------.svg | 28 +- milstd2525/icons/stbops/ofpaa----------.svg | 28 +- milstd2525/icons/stbops/ofpab----------.svg | 28 +- milstd2525/icons/stbops/ofpac----------.svg | 28 +- milstd2525/icons/stbops/ofpp-----------.svg | 28 +- milstd2525/icons/stbops/ofppa----------.svg | 28 +- milstd2525/icons/stbops/ofppb----------.svg | 28 +- milstd2525/icons/stbops/ofppc----------.svg | 28 +- milstd2525/icons/stbops/ofra-----------.svg | 28 +- milstd2525/icons/stbops/ofraa----------.svg | 28 +- milstd2525/icons/stbops/ofrp-----------.svg | 28 +- milstd2525/icons/stbops/ofrpa----------.svg | 28 +- milstd2525/icons/stbops/ofvaa----------.svg | 28 +- milstd2525/icons/stbops/ofvab----------.svg | 28 +- milstd2525/icons/stbops/ofvad----------.svg | 28 +- milstd2525/icons/stbops/ofvae----------.svg | 28 +- milstd2525/icons/stbops/ofvaei---------.svg | 28 +- milstd2525/icons/stbops/ofvam----------.svg | 28 +- milstd2525/icons/stbops/ofvama---------.svg | 28 +- milstd2525/icons/stbops/ofvamb---------.svg | 28 +- milstd2525/icons/stbops/ofvamc---------.svg | 28 +- milstd2525/icons/stbops/ofvap----------.svg | 28 +- milstd2525/icons/stbops/ofvas----------.svg | 28 +- milstd2525/icons/stbops/ofvay----------.svg | 28 +- milstd2525/icons/stbops/ofvpa----------.svg | 28 +- milstd2525/icons/stbops/ofvpb----------.svg | 28 +- milstd2525/icons/stbops/ofvpd----------.svg | 28 +- milstd2525/icons/stbops/ofvpe----------.svg | 28 +- milstd2525/icons/stbops/ofvpei---------.svg | 28 +- milstd2525/icons/stbops/ofvpm----------.svg | 28 +- milstd2525/icons/stbops/ofvpma---------.svg | 28 +- milstd2525/icons/stbops/ofvpmb---------.svg | 28 +- milstd2525/icons/stbops/ofvpmc---------.svg | 28 +- milstd2525/icons/stbops/ofvpp----------.svg | 28 +- milstd2525/icons/stbops/ofvps----------.svg | 28 +- milstd2525/icons/stbops/ofvpy----------.svg | 28 +- milstd2525/icons/stbops/ohga-----------.svg | 28 +- milstd2525/icons/stbops/ohgaa----------.svg | 28 +- milstd2525/icons/stbops/ohgab----------.svg | 28 +- milstd2525/icons/stbops/ohgac----------.svg | 28 +- milstd2525/icons/stbops/ohgad----------.svg | 28 +- milstd2525/icons/stbops/ohgae----------.svg | 28 +- milstd2525/icons/stbops/ohgaf----------.svg | 28 +- milstd2525/icons/stbops/ohgp-----------.svg | 28 +- milstd2525/icons/stbops/ohgpa----------.svg | 28 +- milstd2525/icons/stbops/ohgpb----------.svg | 28 +- milstd2525/icons/stbops/ohgpc----------.svg | 28 +- milstd2525/icons/stbops/ohgpd----------.svg | 28 +- milstd2525/icons/stbops/ohgpe----------.svg | 28 +- milstd2525/icons/stbops/ohgpf----------.svg | 28 +- milstd2525/icons/stbops/ohiad----------.svg | 28 +- milstd2525/icons/stbops/ohiaf----------.svg | 28 +- milstd2525/icons/stbops/ohiag----------.svg | 28 +- milstd2525/icons/stbops/ohiai----------.svg | 28 +- milstd2525/icons/stbops/ohiar----------.svg | 28 +- milstd2525/icons/stbops/ohias----------.svg | 28 +- milstd2525/icons/stbops/ohiav----------.svg | 28 +- milstd2525/icons/stbops/ohipd----------.svg | 28 +- milstd2525/icons/stbops/ohipf----------.svg | 28 +- milstd2525/icons/stbops/ohipg----------.svg | 28 +- milstd2525/icons/stbops/ohipi----------.svg | 28 +- milstd2525/icons/stbops/ohipr----------.svg | 28 +- milstd2525/icons/stbops/ohips----------.svg | 28 +- milstd2525/icons/stbops/ohipv----------.svg | 28 +- milstd2525/icons/stbops/ohlab----------.svg | 28 +- milstd2525/icons/stbops/ohlag----------.svg | 28 +- milstd2525/icons/stbops/ohlam----------.svg | 28 +- milstd2525/icons/stbops/ohlaw----------.svg | 28 +- milstd2525/icons/stbops/ohlpb----------.svg | 28 +- milstd2525/icons/stbops/ohlpg----------.svg | 28 +- milstd2525/icons/stbops/ohlpm----------.svg | 28 +- milstd2525/icons/stbops/ohlpw----------.svg | 28 +- milstd2525/icons/stbops/ohoaa----------.svg | 28 +- milstd2525/icons/stbops/ohoac----------.svg | 28 +- milstd2525/icons/stbops/ohoaca---------.svg | 28 +- milstd2525/icons/stbops/ohoacb---------.svg | 28 +- milstd2525/icons/stbops/ohoacc---------.svg | 28 +- milstd2525/icons/stbops/ohoad----------.svg | 28 +- milstd2525/icons/stbops/ohoae----------.svg | 28 +- milstd2525/icons/stbops/ohoaf----------.svg | 28 +- milstd2525/icons/stbops/ohoaha---------.svg | 28 +- milstd2525/icons/stbops/ohoaht---------.svg | 28 +- milstd2525/icons/stbops/ohoahv---------.svg | 28 +- milstd2525/icons/stbops/ohoak----------.svg | 28 +- milstd2525/icons/stbops/ohoaka---------.svg | 28 +- milstd2525/icons/stbops/ohoam----------.svg | 28 +- milstd2525/icons/stbops/ohoao----------.svg | 28 +- milstd2525/icons/stbops/ohoap----------.svg | 28 +- milstd2525/icons/stbops/ohoarc---------.svg | 28 +- milstd2525/icons/stbops/ohoarw---------.svg | 28 +- milstd2525/icons/stbops/ohoas----------.svg | 28 +- milstd2525/icons/stbops/ohoau----------.svg | 28 +- milstd2525/icons/stbops/ohoay----------.svg | 28 +- milstd2525/icons/stbops/ohoayh---------.svg | 28 +- milstd2525/icons/stbops/ohoayt---------.svg | 28 +- milstd2525/icons/stbops/ohoayw---------.svg | 28 +- milstd2525/icons/stbops/ohopa----------.svg | 28 +- milstd2525/icons/stbops/ohopc----------.svg | 28 +- milstd2525/icons/stbops/ohopca---------.svg | 28 +- milstd2525/icons/stbops/ohopcb---------.svg | 28 +- milstd2525/icons/stbops/ohopcc---------.svg | 28 +- milstd2525/icons/stbops/ohopd----------.svg | 28 +- milstd2525/icons/stbops/ohope----------.svg | 28 +- milstd2525/icons/stbops/ohopf----------.svg | 28 +- milstd2525/icons/stbops/ohopha---------.svg | 28 +- milstd2525/icons/stbops/ohopht---------.svg | 28 +- milstd2525/icons/stbops/ohophv---------.svg | 28 +- milstd2525/icons/stbops/ohopk----------.svg | 28 +- milstd2525/icons/stbops/ohopka---------.svg | 28 +- milstd2525/icons/stbops/ohopm----------.svg | 28 +- milstd2525/icons/stbops/ohopo----------.svg | 28 +- milstd2525/icons/stbops/ohopp----------.svg | 28 +- milstd2525/icons/stbops/ohoprc---------.svg | 28 +- milstd2525/icons/stbops/ohoprw---------.svg | 28 +- milstd2525/icons/stbops/ohops----------.svg | 28 +- milstd2525/icons/stbops/ohopu----------.svg | 28 +- milstd2525/icons/stbops/ohopy----------.svg | 28 +- milstd2525/icons/stbops/ohopyh---------.svg | 28 +- milstd2525/icons/stbops/ohopyt---------.svg | 28 +- milstd2525/icons/stbops/ohopyw---------.svg | 28 +- milstd2525/icons/stbops/ohpa-----------.svg | 28 +- milstd2525/icons/stbops/ohpaa----------.svg | 28 +- milstd2525/icons/stbops/ohpab----------.svg | 28 +- milstd2525/icons/stbops/ohpac----------.svg | 28 +- milstd2525/icons/stbops/ohpp-----------.svg | 28 +- milstd2525/icons/stbops/ohppa----------.svg | 28 +- milstd2525/icons/stbops/ohppb----------.svg | 28 +- milstd2525/icons/stbops/ohppc----------.svg | 28 +- milstd2525/icons/stbops/ohra-----------.svg | 28 +- milstd2525/icons/stbops/ohraa----------.svg | 28 +- milstd2525/icons/stbops/ohrp-----------.svg | 28 +- milstd2525/icons/stbops/ohrpa----------.svg | 28 +- milstd2525/icons/stbops/ohvaa----------.svg | 28 +- milstd2525/icons/stbops/ohvab----------.svg | 28 +- milstd2525/icons/stbops/ohvad----------.svg | 28 +- milstd2525/icons/stbops/ohvae----------.svg | 28 +- milstd2525/icons/stbops/ohvaei---------.svg | 28 +- milstd2525/icons/stbops/ohvam----------.svg | 28 +- milstd2525/icons/stbops/ohvama---------.svg | 28 +- milstd2525/icons/stbops/ohvamb---------.svg | 28 +- milstd2525/icons/stbops/ohvamc---------.svg | 28 +- milstd2525/icons/stbops/ohvap----------.svg | 28 +- milstd2525/icons/stbops/ohvas----------.svg | 28 +- milstd2525/icons/stbops/ohvay----------.svg | 28 +- milstd2525/icons/stbops/ohvpa----------.svg | 28 +- milstd2525/icons/stbops/ohvpb----------.svg | 28 +- milstd2525/icons/stbops/ohvpd----------.svg | 28 +- milstd2525/icons/stbops/ohvpe----------.svg | 28 +- milstd2525/icons/stbops/ohvpei---------.svg | 28 +- milstd2525/icons/stbops/ohvpm----------.svg | 28 +- milstd2525/icons/stbops/ohvpma---------.svg | 28 +- milstd2525/icons/stbops/ohvpmb---------.svg | 28 +- milstd2525/icons/stbops/ohvpmc---------.svg | 28 +- milstd2525/icons/stbops/ohvpp----------.svg | 28 +- milstd2525/icons/stbops/ohvps----------.svg | 28 +- milstd2525/icons/stbops/ohvpy----------.svg | 28 +- milstd2525/icons/stbops/onga-----------.svg | 28 +- milstd2525/icons/stbops/ongaa----------.svg | 28 +- milstd2525/icons/stbops/ongab----------.svg | 28 +- milstd2525/icons/stbops/ongac----------.svg | 28 +- milstd2525/icons/stbops/ongad----------.svg | 28 +- milstd2525/icons/stbops/ongae----------.svg | 28 +- milstd2525/icons/stbops/ongaf----------.svg | 28 +- milstd2525/icons/stbops/ongp-----------.svg | 28 +- milstd2525/icons/stbops/ongpa----------.svg | 28 +- milstd2525/icons/stbops/ongpb----------.svg | 28 +- milstd2525/icons/stbops/ongpc----------.svg | 28 +- milstd2525/icons/stbops/ongpd----------.svg | 28 +- milstd2525/icons/stbops/ongpe----------.svg | 28 +- milstd2525/icons/stbops/ongpf----------.svg | 28 +- milstd2525/icons/stbops/oniad----------.svg | 28 +- milstd2525/icons/stbops/oniaf----------.svg | 28 +- milstd2525/icons/stbops/oniag----------.svg | 28 +- milstd2525/icons/stbops/oniai----------.svg | 28 +- milstd2525/icons/stbops/oniar----------.svg | 28 +- milstd2525/icons/stbops/onias----------.svg | 28 +- milstd2525/icons/stbops/oniav----------.svg | 28 +- milstd2525/icons/stbops/onipd----------.svg | 28 +- milstd2525/icons/stbops/onipf----------.svg | 28 +- milstd2525/icons/stbops/onipg----------.svg | 28 +- milstd2525/icons/stbops/onipi----------.svg | 28 +- milstd2525/icons/stbops/onipr----------.svg | 28 +- milstd2525/icons/stbops/onips----------.svg | 28 +- milstd2525/icons/stbops/onipv----------.svg | 28 +- milstd2525/icons/stbops/onlab----------.svg | 28 +- milstd2525/icons/stbops/onlag----------.svg | 28 +- milstd2525/icons/stbops/onlam----------.svg | 28 +- milstd2525/icons/stbops/onlaw----------.svg | 28 +- milstd2525/icons/stbops/onlpb----------.svg | 28 +- milstd2525/icons/stbops/onlpg----------.svg | 28 +- milstd2525/icons/stbops/onlpm----------.svg | 28 +- milstd2525/icons/stbops/onlpw----------.svg | 28 +- milstd2525/icons/stbops/onoaa----------.svg | 28 +- milstd2525/icons/stbops/onoac----------.svg | 28 +- milstd2525/icons/stbops/onoaca---------.svg | 28 +- milstd2525/icons/stbops/onoacb---------.svg | 28 +- milstd2525/icons/stbops/onoacc---------.svg | 28 +- milstd2525/icons/stbops/onoad----------.svg | 28 +- milstd2525/icons/stbops/onoae----------.svg | 28 +- milstd2525/icons/stbops/onoaf----------.svg | 28 +- milstd2525/icons/stbops/onoaha---------.svg | 28 +- milstd2525/icons/stbops/onoaht---------.svg | 28 +- milstd2525/icons/stbops/onoahv---------.svg | 28 +- milstd2525/icons/stbops/onoak----------.svg | 28 +- milstd2525/icons/stbops/onoaka---------.svg | 28 +- milstd2525/icons/stbops/onoam----------.svg | 28 +- milstd2525/icons/stbops/onoao----------.svg | 28 +- milstd2525/icons/stbops/onoap----------.svg | 28 +- milstd2525/icons/stbops/onoarc---------.svg | 28 +- milstd2525/icons/stbops/onoarw---------.svg | 28 +- milstd2525/icons/stbops/onoas----------.svg | 28 +- milstd2525/icons/stbops/onoau----------.svg | 28 +- milstd2525/icons/stbops/onoay----------.svg | 28 +- milstd2525/icons/stbops/onoayh---------.svg | 28 +- milstd2525/icons/stbops/onoayt---------.svg | 28 +- milstd2525/icons/stbops/onoayw---------.svg | 28 +- milstd2525/icons/stbops/onopa----------.svg | 28 +- milstd2525/icons/stbops/onopc----------.svg | 28 +- milstd2525/icons/stbops/onopca---------.svg | 28 +- milstd2525/icons/stbops/onopcb---------.svg | 28 +- milstd2525/icons/stbops/onopcc---------.svg | 28 +- milstd2525/icons/stbops/onopd----------.svg | 28 +- milstd2525/icons/stbops/onope----------.svg | 28 +- milstd2525/icons/stbops/onopf----------.svg | 28 +- milstd2525/icons/stbops/onopha---------.svg | 28 +- milstd2525/icons/stbops/onopht---------.svg | 28 +- milstd2525/icons/stbops/onophv---------.svg | 28 +- milstd2525/icons/stbops/onopk----------.svg | 28 +- milstd2525/icons/stbops/onopka---------.svg | 28 +- milstd2525/icons/stbops/onopm----------.svg | 28 +- milstd2525/icons/stbops/onopo----------.svg | 28 +- milstd2525/icons/stbops/onopp----------.svg | 28 +- milstd2525/icons/stbops/onoprc---------.svg | 28 +- milstd2525/icons/stbops/onoprw---------.svg | 28 +- milstd2525/icons/stbops/onops----------.svg | 28 +- milstd2525/icons/stbops/onopu----------.svg | 28 +- milstd2525/icons/stbops/onopy----------.svg | 28 +- milstd2525/icons/stbops/onopyh---------.svg | 28 +- milstd2525/icons/stbops/onopyt---------.svg | 28 +- milstd2525/icons/stbops/onopyw---------.svg | 28 +- milstd2525/icons/stbops/onpa-----------.svg | 28 +- milstd2525/icons/stbops/onpaa----------.svg | 28 +- milstd2525/icons/stbops/onpab----------.svg | 28 +- milstd2525/icons/stbops/onpac----------.svg | 28 +- milstd2525/icons/stbops/onpp-----------.svg | 28 +- milstd2525/icons/stbops/onppa----------.svg | 28 +- milstd2525/icons/stbops/onppb----------.svg | 28 +- milstd2525/icons/stbops/onppc----------.svg | 28 +- milstd2525/icons/stbops/onra-----------.svg | 28 +- milstd2525/icons/stbops/onraa----------.svg | 28 +- milstd2525/icons/stbops/onrp-----------.svg | 28 +- milstd2525/icons/stbops/onrpa----------.svg | 28 +- milstd2525/icons/stbops/onvaa----------.svg | 28 +- milstd2525/icons/stbops/onvab----------.svg | 28 +- milstd2525/icons/stbops/onvad----------.svg | 28 +- milstd2525/icons/stbops/onvae----------.svg | 28 +- milstd2525/icons/stbops/onvaei---------.svg | 28 +- milstd2525/icons/stbops/onvam----------.svg | 28 +- milstd2525/icons/stbops/onvama---------.svg | 28 +- milstd2525/icons/stbops/onvamb---------.svg | 28 +- milstd2525/icons/stbops/onvamc---------.svg | 28 +- milstd2525/icons/stbops/onvap----------.svg | 28 +- milstd2525/icons/stbops/onvas----------.svg | 28 +- milstd2525/icons/stbops/onvay----------.svg | 28 +- milstd2525/icons/stbops/onvpa----------.svg | 28 +- milstd2525/icons/stbops/onvpb----------.svg | 28 +- milstd2525/icons/stbops/onvpd----------.svg | 28 +- milstd2525/icons/stbops/onvpe----------.svg | 28 +- milstd2525/icons/stbops/onvpei---------.svg | 28 +- milstd2525/icons/stbops/onvpm----------.svg | 28 +- milstd2525/icons/stbops/onvpma---------.svg | 28 +- milstd2525/icons/stbops/onvpmb---------.svg | 28 +- milstd2525/icons/stbops/onvpmc---------.svg | 28 +- milstd2525/icons/stbops/onvpp----------.svg | 28 +- milstd2525/icons/stbops/onvps----------.svg | 28 +- milstd2525/icons/stbops/onvpy----------.svg | 28 +- milstd2525/icons/stbops/ouga-----------.svg | 28 +- milstd2525/icons/stbops/ougaa----------.svg | 28 +- milstd2525/icons/stbops/ougab----------.svg | 28 +- milstd2525/icons/stbops/ougac----------.svg | 28 +- milstd2525/icons/stbops/ougad----------.svg | 28 +- milstd2525/icons/stbops/ougae----------.svg | 28 +- milstd2525/icons/stbops/ougaf----------.svg | 28 +- milstd2525/icons/stbops/ougp-----------.svg | 28 +- milstd2525/icons/stbops/ougpa----------.svg | 28 +- milstd2525/icons/stbops/ougpb----------.svg | 28 +- milstd2525/icons/stbops/ougpc----------.svg | 28 +- milstd2525/icons/stbops/ougpd----------.svg | 28 +- milstd2525/icons/stbops/ougpe----------.svg | 28 +- milstd2525/icons/stbops/ougpf----------.svg | 28 +- milstd2525/icons/stbops/ouiad----------.svg | 28 +- milstd2525/icons/stbops/ouiaf----------.svg | 28 +- milstd2525/icons/stbops/ouiag----------.svg | 28 +- milstd2525/icons/stbops/ouiai----------.svg | 28 +- milstd2525/icons/stbops/ouiar----------.svg | 28 +- milstd2525/icons/stbops/ouias----------.svg | 28 +- milstd2525/icons/stbops/ouiav----------.svg | 28 +- milstd2525/icons/stbops/ouipd----------.svg | 28 +- milstd2525/icons/stbops/ouipf----------.svg | 28 +- milstd2525/icons/stbops/ouipg----------.svg | 28 +- milstd2525/icons/stbops/ouipi----------.svg | 28 +- milstd2525/icons/stbops/ouipr----------.svg | 28 +- milstd2525/icons/stbops/ouips----------.svg | 28 +- milstd2525/icons/stbops/ouipv----------.svg | 28 +- milstd2525/icons/stbops/oulab----------.svg | 28 +- milstd2525/icons/stbops/oulag----------.svg | 28 +- milstd2525/icons/stbops/oulam----------.svg | 28 +- milstd2525/icons/stbops/oulaw----------.svg | 28 +- milstd2525/icons/stbops/oulpb----------.svg | 28 +- milstd2525/icons/stbops/oulpg----------.svg | 28 +- milstd2525/icons/stbops/oulpm----------.svg | 28 +- milstd2525/icons/stbops/oulpw----------.svg | 28 +- milstd2525/icons/stbops/ouoaa----------.svg | 28 +- milstd2525/icons/stbops/ouoac----------.svg | 28 +- milstd2525/icons/stbops/ouoaca---------.svg | 28 +- milstd2525/icons/stbops/ouoacb---------.svg | 28 +- milstd2525/icons/stbops/ouoacc---------.svg | 28 +- milstd2525/icons/stbops/ouoad----------.svg | 28 +- milstd2525/icons/stbops/ouoae----------.svg | 28 +- milstd2525/icons/stbops/ouoaf----------.svg | 28 +- milstd2525/icons/stbops/ouoaha---------.svg | 28 +- milstd2525/icons/stbops/ouoaht---------.svg | 28 +- milstd2525/icons/stbops/ouoahv---------.svg | 28 +- milstd2525/icons/stbops/ouoak----------.svg | 28 +- milstd2525/icons/stbops/ouoaka---------.svg | 28 +- milstd2525/icons/stbops/ouoam----------.svg | 28 +- milstd2525/icons/stbops/ouoao----------.svg | 28 +- milstd2525/icons/stbops/ouoap----------.svg | 28 +- milstd2525/icons/stbops/ouoarc---------.svg | 28 +- milstd2525/icons/stbops/ouoarw---------.svg | 28 +- milstd2525/icons/stbops/ouoas----------.svg | 28 +- milstd2525/icons/stbops/ouoau----------.svg | 28 +- milstd2525/icons/stbops/ouoay----------.svg | 28 +- milstd2525/icons/stbops/ouoayh---------.svg | 28 +- milstd2525/icons/stbops/ouoayt---------.svg | 28 +- milstd2525/icons/stbops/ouoayw---------.svg | 28 +- milstd2525/icons/stbops/ouopa----------.svg | 28 +- milstd2525/icons/stbops/ouopc----------.svg | 28 +- milstd2525/icons/stbops/ouopca---------.svg | 28 +- milstd2525/icons/stbops/ouopcb---------.svg | 28 +- milstd2525/icons/stbops/ouopcc---------.svg | 28 +- milstd2525/icons/stbops/ouopd----------.svg | 28 +- milstd2525/icons/stbops/ouope----------.svg | 28 +- milstd2525/icons/stbops/ouopf----------.svg | 28 +- milstd2525/icons/stbops/ouopha---------.svg | 28 +- milstd2525/icons/stbops/ouopht---------.svg | 28 +- milstd2525/icons/stbops/ouophv---------.svg | 28 +- milstd2525/icons/stbops/ouopk----------.svg | 28 +- milstd2525/icons/stbops/ouopka---------.svg | 28 +- milstd2525/icons/stbops/ouopm----------.svg | 28 +- milstd2525/icons/stbops/ouopo----------.svg | 28 +- milstd2525/icons/stbops/ouopp----------.svg | 28 +- milstd2525/icons/stbops/ouoprc---------.svg | 28 +- milstd2525/icons/stbops/ouoprw---------.svg | 28 +- milstd2525/icons/stbops/ouops----------.svg | 28 +- milstd2525/icons/stbops/ouopu----------.svg | 28 +- milstd2525/icons/stbops/ouopy----------.svg | 28 +- milstd2525/icons/stbops/ouopyh---------.svg | 28 +- milstd2525/icons/stbops/ouopyt---------.svg | 28 +- milstd2525/icons/stbops/ouopyw---------.svg | 28 +- milstd2525/icons/stbops/oupa-----------.svg | 28 +- milstd2525/icons/stbops/oupaa----------.svg | 28 +- milstd2525/icons/stbops/oupab----------.svg | 28 +- milstd2525/icons/stbops/oupac----------.svg | 28 +- milstd2525/icons/stbops/oupp-----------.svg | 28 +- milstd2525/icons/stbops/ouppa----------.svg | 28 +- milstd2525/icons/stbops/ouppb----------.svg | 28 +- milstd2525/icons/stbops/ouppc----------.svg | 28 +- milstd2525/icons/stbops/oura-----------.svg | 28 +- milstd2525/icons/stbops/ouraa----------.svg | 28 +- milstd2525/icons/stbops/ourp-----------.svg | 28 +- milstd2525/icons/stbops/ourpa----------.svg | 28 +- milstd2525/icons/stbops/ouvaa----------.svg | 28 +- milstd2525/icons/stbops/ouvab----------.svg | 28 +- milstd2525/icons/stbops/ouvad----------.svg | 28 +- milstd2525/icons/stbops/ouvae----------.svg | 28 +- milstd2525/icons/stbops/ouvaei---------.svg | 28 +- milstd2525/icons/stbops/ouvam----------.svg | 28 +- milstd2525/icons/stbops/ouvama---------.svg | 28 +- milstd2525/icons/stbops/ouvamb---------.svg | 28 +- milstd2525/icons/stbops/ouvamc---------.svg | 28 +- milstd2525/icons/stbops/ouvap----------.svg | 28 +- milstd2525/icons/stbops/ouvas----------.svg | 28 +- milstd2525/icons/stbops/ouvay----------.svg | 28 +- milstd2525/icons/stbops/ouvpa----------.svg | 28 +- milstd2525/icons/stbops/ouvpb----------.svg | 28 +- milstd2525/icons/stbops/ouvpd----------.svg | 28 +- milstd2525/icons/stbops/ouvpe----------.svg | 28 +- milstd2525/icons/stbops/ouvpei---------.svg | 28 +- milstd2525/icons/stbops/ouvpm----------.svg | 28 +- milstd2525/icons/stbops/ouvpma---------.svg | 28 +- milstd2525/icons/stbops/ouvpmb---------.svg | 28 +- milstd2525/icons/stbops/ouvpmc---------.svg | 28 +- milstd2525/icons/stbops/ouvpp----------.svg | 28 +- milstd2525/icons/stbops/ouvps----------.svg | 28 +- milstd2525/icons/stbops/ouvpy----------.svg | 28 +- milstd2525/icons/tacgrp/g-fapcb--------.svg | 28 +- milstd2525/icons/tacgrp/g-gadlf--------.svg | 28 +- milstd2525/icons/tacgrp/g-gagpae-------.svg | 28 +- milstd2525/icons/tacgrp/g-gagpaj-------.svg | 28 +- milstd2525/icons/tacgrp/g-gagpbua------.svg | 28 +- milstd2525/icons/tacgrp/g-gpdlf--------.svg | 28 +- milstd2525/icons/tacgrp/g-gpgpae-------.svg | 28 +- milstd2525/icons/tacgrp/g-gpgpaj-------.svg | 28 +- milstd2525/icons/tacgrp/g-gpgpbua------.svg | 28 +- milstd2525/icons/tacgrp/g-mandp--------.svg | 28 +- milstd2525/icons/tacgrp/g-mpndp--------.svg | 28 +- milstd2525/icons/tacgrp/g-sapn---------.svg | 28 +- milstd2525/icons/tacgrp/g-sppn---------.svg | 28 +- milstd2525/icons/tacgrp/g-tad----------.svg | 28 +- milstd2525/icons/unk/-fzp-----------.svg | 28 +- milstd2525/icons/unk/-hzp-----------.svg | 28 +- milstd2525/icons/unk/-nzp-----------.svg | 28 +- milstd2525/icons/unk/-uzp-----------.svg | 28 +- milstd2525/icons/war/sfaa-----------.svg | 28 +- milstd2525/icons/war/sfaac----------.svg | 28 +- milstd2525/icons/war/sfaacf---------.svg | 28 +- milstd2525/icons/war/sfaach---------.svg | 28 +- milstd2525/icons/war/sfaacl---------.svg | 28 +- milstd2525/icons/war/sfaam----------.svg | 28 +- milstd2525/icons/war/sfaame---------.svg | 28 +- milstd2525/icons/war/sfaamf---------.svg | 28 +- milstd2525/icons/war/sfaamfa--------.svg | 28 +- milstd2525/icons/war/sfaamfb--------.svg | 28 +- milstd2525/icons/war/sfaamfc--------.svg | 28 +- milstd2525/icons/war/sfaamfch-------.svg | 28 +- milstd2525/icons/war/sfaamfcl-------.svg | 28 +- milstd2525/icons/war/sfaamfcm-------.svg | 28 +- milstd2525/icons/war/sfaamfd--------.svg | 28 +- milstd2525/icons/war/sfaamff--------.svg | 28 +- milstd2525/icons/war/sfaamffi-------.svg | 28 +- milstd2525/icons/war/sfaamfh--------.svg | 28 +- milstd2525/icons/war/sfaamfj--------.svg | 28 +- milstd2525/icons/war/sfaamfk--------.svg | 28 +- milstd2525/icons/war/sfaamfkb-------.svg | 28 +- milstd2525/icons/war/sfaamfkd-------.svg | 28 +- milstd2525/icons/war/sfaamfl--------.svg | 28 +- milstd2525/icons/war/sfaamfm--------.svg | 28 +- milstd2525/icons/war/sfaamfo--------.svg | 28 +- milstd2525/icons/war/sfaamfp--------.svg | 28 +- milstd2525/icons/war/sfaamfpm-------.svg | 28 +- milstd2525/icons/war/sfaamfpn-------.svg | 28 +- milstd2525/icons/war/sfaamfq--------.svg | 28 +- milstd2525/icons/war/sfaamfqa-------.svg | 28 +- milstd2525/icons/war/sfaamfqb-------.svg | 28 +- milstd2525/icons/war/sfaamfqc-------.svg | 28 +- milstd2525/icons/war/sfaamfqd-------.svg | 28 +- milstd2525/icons/war/sfaamfqf-------.svg | 28 +- milstd2525/icons/war/sfaamfqh-------.svg | 28 +- milstd2525/icons/war/sfaamfqi-------.svg | 28 +- milstd2525/icons/war/sfaamfqj-------.svg | 28 +- milstd2525/icons/war/sfaamfqk-------.svg | 28 +- milstd2525/icons/war/sfaamfql-------.svg | 28 +- milstd2525/icons/war/sfaamfqm-------.svg | 28 +- milstd2525/icons/war/sfaamfqn-------.svg | 28 +- milstd2525/icons/war/sfaamfqo-------.svg | 28 +- milstd2525/icons/war/sfaamfqp-------.svg | 28 +- milstd2525/icons/war/sfaamfqr-------.svg | 28 +- milstd2525/icons/war/sfaamfqrw------.svg | 28 +- milstd2525/icons/war/sfaamfqrx------.svg | 28 +- milstd2525/icons/war/sfaamfqrz------.svg | 28 +- milstd2525/icons/war/sfaamfqs-------.svg | 28 +- milstd2525/icons/war/sfaamfqt-------.svg | 28 +- milstd2525/icons/war/sfaamfqu-------.svg | 28 +- milstd2525/icons/war/sfaamfqy-------.svg | 28 +- milstd2525/icons/war/sfaamfr--------.svg | 28 +- milstd2525/icons/war/sfaamfrw-------.svg | 28 +- milstd2525/icons/war/sfaamfrx-------.svg | 28 +- milstd2525/icons/war/sfaamfrz-------.svg | 28 +- milstd2525/icons/war/sfaamfs--------.svg | 28 +- milstd2525/icons/war/sfaamft--------.svg | 28 +- milstd2525/icons/war/sfaamfu--------.svg | 28 +- milstd2525/icons/war/sfaamfuh-------.svg | 28 +- milstd2525/icons/war/sfaamful-------.svg | 28 +- milstd2525/icons/war/sfaamfum-------.svg | 28 +- milstd2525/icons/war/sfaamfy--------.svg | 28 +- milstd2525/icons/war/sfaamh---------.svg | 28 +- milstd2525/icons/war/sfaamha--------.svg | 28 +- milstd2525/icons/war/sfaamhc--------.svg | 28 +- milstd2525/icons/war/sfaamhch-------.svg | 28 +- milstd2525/icons/war/sfaamhcl-------.svg | 28 +- milstd2525/icons/war/sfaamhcm-------.svg | 28 +- milstd2525/icons/war/sfaamhd--------.svg | 28 +- milstd2525/icons/war/sfaamhh--------.svg | 28 +- milstd2525/icons/war/sfaamhi--------.svg | 28 +- milstd2525/icons/war/sfaamhj--------.svg | 28 +- milstd2525/icons/war/sfaamhk--------.svg | 28 +- milstd2525/icons/war/sfaamhm--------.svg | 28 +- milstd2525/icons/war/sfaamho--------.svg | 28 +- milstd2525/icons/war/sfaamhq--------.svg | 28 +- milstd2525/icons/war/sfaamhr--------.svg | 28 +- milstd2525/icons/war/sfaamhs--------.svg | 28 +- milstd2525/icons/war/sfaamht--------.svg | 28 +- milstd2525/icons/war/sfaamhu--------.svg | 28 +- milstd2525/icons/war/sfaamhuh-------.svg | 28 +- milstd2525/icons/war/sfaamhul-------.svg | 28 +- milstd2525/icons/war/sfaamhum-------.svg | 28 +- milstd2525/icons/war/sfaaml---------.svg | 28 +- milstd2525/icons/war/sfaamv---------.svg | 28 +- milstd2525/icons/war/sfaaw----------.svg | 28 +- milstd2525/icons/war/sfaawb---------.svg | 28 +- milstd2525/icons/war/sfaawd---------.svg | 28 +- milstd2525/icons/war/sfaawm---------.svg | 28 +- milstd2525/icons/war/sfaawma--------.svg | 28 +- milstd2525/icons/war/sfaawmaa-------.svg | 28 +- milstd2525/icons/war/sfaawmap-------.svg | 28 +- milstd2525/icons/war/sfaawmas-------.svg | 28 +- milstd2525/icons/war/sfaawmb--------.svg | 28 +- milstd2525/icons/war/sfaawmcm-------.svg | 28 +- milstd2525/icons/war/sfaawms--------.svg | 28 +- milstd2525/icons/war/sfaawmsa-------.svg | 28 +- milstd2525/icons/war/sfaawmsb-------.svg | 28 +- milstd2525/icons/war/sfaawmss-------.svg | 28 +- milstd2525/icons/war/sfaawmsu-------.svg | 28 +- milstd2525/icons/war/sfaawmu--------.svg | 28 +- milstd2525/icons/war/sfap-----------.svg | 28 +- milstd2525/icons/war/sfapc----------.svg | 28 +- milstd2525/icons/war/sfapcf---------.svg | 28 +- milstd2525/icons/war/sfapch---------.svg | 28 +- milstd2525/icons/war/sfapcl---------.svg | 28 +- milstd2525/icons/war/sfapm----------.svg | 28 +- milstd2525/icons/war/sfapme---------.svg | 28 +- milstd2525/icons/war/sfapmf---------.svg | 28 +- milstd2525/icons/war/sfapmfa--------.svg | 28 +- milstd2525/icons/war/sfapmfb--------.svg | 28 +- milstd2525/icons/war/sfapmfc--------.svg | 28 +- milstd2525/icons/war/sfapmfch-------.svg | 28 +- milstd2525/icons/war/sfapmfcl-------.svg | 28 +- milstd2525/icons/war/sfapmfcm-------.svg | 28 +- milstd2525/icons/war/sfapmfd--------.svg | 28 +- milstd2525/icons/war/sfapmff--------.svg | 28 +- milstd2525/icons/war/sfapmffi-------.svg | 28 +- milstd2525/icons/war/sfapmfh--------.svg | 28 +- milstd2525/icons/war/sfapmfj--------.svg | 28 +- milstd2525/icons/war/sfapmfk--------.svg | 28 +- milstd2525/icons/war/sfapmfkb-------.svg | 28 +- milstd2525/icons/war/sfapmfkd-------.svg | 28 +- milstd2525/icons/war/sfapmfl--------.svg | 28 +- milstd2525/icons/war/sfapmfm--------.svg | 28 +- milstd2525/icons/war/sfapmfo--------.svg | 28 +- milstd2525/icons/war/sfapmfp--------.svg | 28 +- milstd2525/icons/war/sfapmfpm-------.svg | 28 +- milstd2525/icons/war/sfapmfpn-------.svg | 28 +- milstd2525/icons/war/sfapmfq--------.svg | 28 +- milstd2525/icons/war/sfapmfqa-------.svg | 28 +- milstd2525/icons/war/sfapmfqb-------.svg | 28 +- milstd2525/icons/war/sfapmfqc-------.svg | 28 +- milstd2525/icons/war/sfapmfqd-------.svg | 28 +- milstd2525/icons/war/sfapmfqf-------.svg | 28 +- milstd2525/icons/war/sfapmfqh-------.svg | 28 +- milstd2525/icons/war/sfapmfqi-------.svg | 28 +- milstd2525/icons/war/sfapmfqj-------.svg | 28 +- milstd2525/icons/war/sfapmfqk-------.svg | 28 +- milstd2525/icons/war/sfapmfql-------.svg | 28 +- milstd2525/icons/war/sfapmfqm-------.svg | 28 +- milstd2525/icons/war/sfapmfqn-------.svg | 28 +- milstd2525/icons/war/sfapmfqo-------.svg | 28 +- milstd2525/icons/war/sfapmfqp-------.svg | 28 +- milstd2525/icons/war/sfapmfqr-------.svg | 28 +- milstd2525/icons/war/sfapmfqrw------.svg | 28 +- milstd2525/icons/war/sfapmfqrx------.svg | 28 +- milstd2525/icons/war/sfapmfqrz------.svg | 28 +- milstd2525/icons/war/sfapmfqs-------.svg | 28 +- milstd2525/icons/war/sfapmfqt-------.svg | 28 +- milstd2525/icons/war/sfapmfqu-------.svg | 28 +- milstd2525/icons/war/sfapmfqy-------.svg | 28 +- milstd2525/icons/war/sfapmfr--------.svg | 28 +- milstd2525/icons/war/sfapmfrw-------.svg | 28 +- milstd2525/icons/war/sfapmfrx-------.svg | 28 +- milstd2525/icons/war/sfapmfrz-------.svg | 28 +- milstd2525/icons/war/sfapmfs--------.svg | 28 +- milstd2525/icons/war/sfapmft--------.svg | 28 +- milstd2525/icons/war/sfapmfu--------.svg | 28 +- milstd2525/icons/war/sfapmfuh-------.svg | 28 +- milstd2525/icons/war/sfapmful-------.svg | 28 +- milstd2525/icons/war/sfapmfum-------.svg | 28 +- milstd2525/icons/war/sfapmfy--------.svg | 28 +- milstd2525/icons/war/sfapmh---------.svg | 28 +- milstd2525/icons/war/sfapmha--------.svg | 28 +- milstd2525/icons/war/sfapmhc--------.svg | 28 +- milstd2525/icons/war/sfapmhch-------.svg | 28 +- milstd2525/icons/war/sfapmhcl-------.svg | 28 +- milstd2525/icons/war/sfapmhcm-------.svg | 28 +- milstd2525/icons/war/sfapmhd--------.svg | 28 +- milstd2525/icons/war/sfapmhh--------.svg | 28 +- milstd2525/icons/war/sfapmhi--------.svg | 28 +- milstd2525/icons/war/sfapmhj--------.svg | 28 +- milstd2525/icons/war/sfapmhk--------.svg | 28 +- milstd2525/icons/war/sfapmhm--------.svg | 28 +- milstd2525/icons/war/sfapmho--------.svg | 28 +- milstd2525/icons/war/sfapmhq--------.svg | 28 +- milstd2525/icons/war/sfapmhr--------.svg | 28 +- milstd2525/icons/war/sfapmhs--------.svg | 28 +- milstd2525/icons/war/sfapmht--------.svg | 28 +- milstd2525/icons/war/sfapmhu--------.svg | 28 +- milstd2525/icons/war/sfapmhuh-------.svg | 28 +- milstd2525/icons/war/sfapmhul-------.svg | 28 +- milstd2525/icons/war/sfapmhum-------.svg | 28 +- milstd2525/icons/war/sfapml---------.svg | 28 +- milstd2525/icons/war/sfapmv---------.svg | 28 +- milstd2525/icons/war/sfapw----------.svg | 28 +- milstd2525/icons/war/sfapwb---------.svg | 28 +- milstd2525/icons/war/sfapwd---------.svg | 28 +- milstd2525/icons/war/sfapwm---------.svg | 28 +- milstd2525/icons/war/sfapwma--------.svg | 28 +- milstd2525/icons/war/sfapwmaa-------.svg | 28 +- milstd2525/icons/war/sfapwmap-------.svg | 28 +- milstd2525/icons/war/sfapwmas-------.svg | 28 +- milstd2525/icons/war/sfapwmb--------.svg | 28 +- milstd2525/icons/war/sfapwmcm-------.svg | 28 +- milstd2525/icons/war/sfapwms--------.svg | 28 +- milstd2525/icons/war/sfapwmsa-------.svg | 28 +- milstd2525/icons/war/sfapwmsb-------.svg | 28 +- milstd2525/icons/war/sfapwmss-------.svg | 28 +- milstd2525/icons/war/sfapwmsu-------.svg | 28 +- milstd2525/icons/war/sfapwmu--------.svg | 28 +- milstd2525/icons/war/sffa-----------.svg | 28 +- milstd2525/icons/war/sffaa----------.svg | 28 +- milstd2525/icons/war/sffaaf---------.svg | 28 +- milstd2525/icons/war/sffaafa--------.svg | 28 +- milstd2525/icons/war/sffaafk--------.svg | 28 +- milstd2525/icons/war/sffaafu--------.svg | 28 +- milstd2525/icons/war/sffaafuh-------.svg | 28 +- milstd2525/icons/war/sffaaful-------.svg | 28 +- milstd2525/icons/war/sffaafum-------.svg | 28 +- milstd2525/icons/war/sffaah---------.svg | 28 +- milstd2525/icons/war/sffaaha--------.svg | 28 +- milstd2525/icons/war/sffaahh--------.svg | 28 +- milstd2525/icons/war/sffaahu--------.svg | 28 +- milstd2525/icons/war/sffaahuh-------.svg | 28 +- milstd2525/icons/war/sffaahul-------.svg | 28 +- milstd2525/icons/war/sffaahum-------.svg | 28 +- milstd2525/icons/war/sffaav---------.svg | 28 +- milstd2525/icons/war/sffab----------.svg | 28 +- milstd2525/icons/war/sffag----------.svg | 28 +- milstd2525/icons/war/sffagc---------.svg | 28 +- milstd2525/icons/war/sffagp---------.svg | 28 +- milstd2525/icons/war/sffagpa--------.svg | 28 +- milstd2525/icons/war/sffagr---------.svg | 28 +- milstd2525/icons/war/sffags---------.svg | 28 +- milstd2525/icons/war/sffan----------.svg | 28 +- milstd2525/icons/war/sffanb---------.svg | 28 +- milstd2525/icons/war/sffann---------.svg | 28 +- milstd2525/icons/war/sffans---------.svg | 28 +- milstd2525/icons/war/sffanu---------.svg | 28 +- milstd2525/icons/war/sffp-----------.svg | 28 +- milstd2525/icons/war/sffpa----------.svg | 28 +- milstd2525/icons/war/sffpaf---------.svg | 28 +- milstd2525/icons/war/sffpafa--------.svg | 28 +- milstd2525/icons/war/sffpafk--------.svg | 28 +- milstd2525/icons/war/sffpafu--------.svg | 28 +- milstd2525/icons/war/sffpafuh-------.svg | 28 +- milstd2525/icons/war/sffpaful-------.svg | 28 +- milstd2525/icons/war/sffpafum-------.svg | 28 +- milstd2525/icons/war/sffpah---------.svg | 28 +- milstd2525/icons/war/sffpaha--------.svg | 28 +- milstd2525/icons/war/sffpahh--------.svg | 28 +- milstd2525/icons/war/sffpahu--------.svg | 28 +- milstd2525/icons/war/sffpahuh-------.svg | 28 +- milstd2525/icons/war/sffpahul-------.svg | 28 +- milstd2525/icons/war/sffpahum-------.svg | 28 +- milstd2525/icons/war/sffpav---------.svg | 28 +- milstd2525/icons/war/sffpb----------.svg | 28 +- milstd2525/icons/war/sffpg----------.svg | 28 +- milstd2525/icons/war/sffpgc---------.svg | 28 +- milstd2525/icons/war/sffpgp---------.svg | 28 +- milstd2525/icons/war/sffpgpa--------.svg | 28 +- milstd2525/icons/war/sffpgr---------.svg | 28 +- milstd2525/icons/war/sffpgs---------.svg | 28 +- milstd2525/icons/war/sffpn----------.svg | 28 +- milstd2525/icons/war/sffpnb---------.svg | 28 +- milstd2525/icons/war/sffpnn---------.svg | 28 +- milstd2525/icons/war/sffpns---------.svg | 28 +- milstd2525/icons/war/sffpnu---------.svg | 28 +- milstd2525/icons/war/sfga-----------.svg | 28 +- milstd2525/icons/war/sfgae----------.svg | 28 +- milstd2525/icons/war/sfgaes---------.svg | 28 +- milstd2525/icons/war/sfgaese--------.svg | 28 +- milstd2525/icons/war/sfgaesr--------.svg | 28 +- milstd2525/icons/war/sfgaev---------.svg | 28 +- milstd2525/icons/war/sfgaeva--------.svg | 28 +- milstd2525/icons/war/sfgaevaa-------.svg | 28 +- milstd2525/icons/war/sfgaevaar------.svg | 28 +- milstd2525/icons/war/sfgaevac-------.svg | 28 +- milstd2525/icons/war/sfgaevai-------.svg | 28 +- milstd2525/icons/war/sfgaeval-------.svg | 28 +- milstd2525/icons/war/sfgaevas-------.svg | 28 +- milstd2525/icons/war/sfgaevat-------.svg | 28 +- milstd2525/icons/war/sfgaevath------.svg | 28 +- milstd2525/icons/war/sfgaevathr-----.svg | 28 +- milstd2525/icons/war/sfgaevatl------.svg | 28 +- milstd2525/icons/war/sfgaevatlr-----.svg | 28 +- milstd2525/icons/war/sfgaevatm------.svg | 28 +- milstd2525/icons/war/sfgaevatmr-----.svg | 28 +- milstd2525/icons/war/sfgaevc--------.svg | 28 +- milstd2525/icons/war/sfgaevca-------.svg | 28 +- milstd2525/icons/war/sfgaevcah------.svg | 28 +- milstd2525/icons/war/sfgaevcal------.svg | 28 +- milstd2525/icons/war/sfgaevcam------.svg | 28 +- milstd2525/icons/war/sfgaevcf-------.svg | 28 +- milstd2525/icons/war/sfgaevcfh------.svg | 28 +- milstd2525/icons/war/sfgaevcfl------.svg | 28 +- milstd2525/icons/war/sfgaevcfm------.svg | 28 +- milstd2525/icons/war/sfgaevcj-------.svg | 28 +- milstd2525/icons/war/sfgaevcjh------.svg | 28 +- milstd2525/icons/war/sfgaevcjl------.svg | 28 +- milstd2525/icons/war/sfgaevcjm------.svg | 28 +- milstd2525/icons/war/sfgaevcm-------.svg | 28 +- milstd2525/icons/war/sfgaevcmh------.svg | 28 +- milstd2525/icons/war/sfgaevcml------.svg | 28 +- milstd2525/icons/war/sfgaevcmm------.svg | 28 +- milstd2525/icons/war/sfgaevco-------.svg | 28 +- milstd2525/icons/war/sfgaevcoh------.svg | 28 +- milstd2525/icons/war/sfgaevcol------.svg | 28 +- milstd2525/icons/war/sfgaevcom------.svg | 28 +- milstd2525/icons/war/sfgaevct-------.svg | 28 +- milstd2525/icons/war/sfgaevcth------.svg | 28 +- milstd2525/icons/war/sfgaevctl------.svg | 28 +- milstd2525/icons/war/sfgaevctm------.svg | 28 +- milstd2525/icons/war/sfgaevcu-------.svg | 28 +- milstd2525/icons/war/sfgaevcuh------.svg | 28 +- milstd2525/icons/war/sfgaevcul------.svg | 28 +- milstd2525/icons/war/sfgaevcum------.svg | 28 +- milstd2525/icons/war/sfgaeve--------.svg | 28 +- milstd2525/icons/war/sfgaevea-------.svg | 28 +- milstd2525/icons/war/sfgaeveaa------.svg | 28 +- milstd2525/icons/war/sfgaeveat------.svg | 28 +- milstd2525/icons/war/sfgaeveb-------.svg | 28 +- milstd2525/icons/war/sfgaevec-------.svg | 28 +- milstd2525/icons/war/sfgaeved-------.svg | 28 +- milstd2525/icons/war/sfgaeveda------.svg | 28 +- milstd2525/icons/war/sfgaevee-------.svg | 28 +- milstd2525/icons/war/sfgaevef-------.svg | 28 +- milstd2525/icons/war/sfgaeveh-------.svg | 28 +- milstd2525/icons/war/sfgaevem-------.svg | 28 +- milstd2525/icons/war/sfgaeveml------.svg | 28 +- milstd2525/icons/war/sfgaevemv------.svg | 28 +- milstd2525/icons/war/sfgaever-------.svg | 28 +- milstd2525/icons/war/sfgaeves-------.svg | 28 +- milstd2525/icons/war/sfgaevm--------.svg | 28 +- milstd2525/icons/war/sfgaevs--------.svg | 28 +- milstd2525/icons/war/sfgaevsc-------.svg | 28 +- milstd2525/icons/war/sfgaevsp-------.svg | 28 +- milstd2525/icons/war/sfgaevsr-------.svg | 28 +- milstd2525/icons/war/sfgaevst-------.svg | 28 +- milstd2525/icons/war/sfgaevsw-------.svg | 28 +- milstd2525/icons/war/sfgaevt--------.svg | 28 +- milstd2525/icons/war/sfgaevu--------.svg | 28 +- milstd2525/icons/war/sfgaevua-------.svg | 28 +- milstd2525/icons/war/sfgaevuaa------.svg | 28 +- milstd2525/icons/war/sfgaevub-------.svg | 28 +- milstd2525/icons/war/sfgaevul-------.svg | 28 +- milstd2525/icons/war/sfgaevur-------.svg | 28 +- milstd2525/icons/war/sfgaevus-------.svg | 28 +- milstd2525/icons/war/sfgaevush------.svg | 28 +- milstd2525/icons/war/sfgaevusl------.svg | 28 +- milstd2525/icons/war/sfgaevusm------.svg | 28 +- milstd2525/icons/war/sfgaevut-------.svg | 28 +- milstd2525/icons/war/sfgaevuth------.svg | 28 +- milstd2525/icons/war/sfgaevutl------.svg | 28 +- milstd2525/icons/war/sfgaevux-------.svg | 28 +- milstd2525/icons/war/sfgaewa--------.svg | 28 +- milstd2525/icons/war/sfgaewah-------.svg | 28 +- milstd2525/icons/war/sfgaewal-------.svg | 28 +- milstd2525/icons/war/sfgaewam-------.svg | 28 +- milstd2525/icons/war/sfgaewd--------.svg | 28 +- milstd2525/icons/war/sfgaewdh-------.svg | 28 +- milstd2525/icons/war/sfgaewdhs------.svg | 28 +- milstd2525/icons/war/sfgaewdl-------.svg | 28 +- milstd2525/icons/war/sfgaewdls------.svg | 28 +- milstd2525/icons/war/sfgaewdm-------.svg | 28 +- milstd2525/icons/war/sfgaewdms------.svg | 28 +- milstd2525/icons/war/sfgaewg--------.svg | 28 +- milstd2525/icons/war/sfgaewgh-------.svg | 28 +- milstd2525/icons/war/sfgaewgl-------.svg | 28 +- milstd2525/icons/war/sfgaewgm-------.svg | 28 +- milstd2525/icons/war/sfgaewgr-------.svg | 28 +- milstd2525/icons/war/sfgaewh--------.svg | 28 +- milstd2525/icons/war/sfgaewhh-------.svg | 28 +- milstd2525/icons/war/sfgaewhhs------.svg | 28 +- milstd2525/icons/war/sfgaewhl-------.svg | 28 +- milstd2525/icons/war/sfgaewhls------.svg | 28 +- milstd2525/icons/war/sfgaewhm-------.svg | 28 +- milstd2525/icons/war/sfgaewhms------.svg | 28 +- milstd2525/icons/war/sfgaewm--------.svg | 28 +- milstd2525/icons/war/sfgaewma-------.svg | 28 +- milstd2525/icons/war/sfgaewmai------.svg | 28 +- milstd2525/icons/war/sfgaewmaie-----.svg | 28 +- milstd2525/icons/war/sfgaewmair-----.svg | 28 +- milstd2525/icons/war/sfgaewmal------.svg | 28 +- milstd2525/icons/war/sfgaewmale-----.svg | 28 +- milstd2525/icons/war/sfgaewmalr-----.svg | 28 +- milstd2525/icons/war/sfgaewmas------.svg | 28 +- milstd2525/icons/war/sfgaewmase-----.svg | 28 +- milstd2525/icons/war/sfgaewmasr-----.svg | 28 +- milstd2525/icons/war/sfgaewmat------.svg | 28 +- milstd2525/icons/war/sfgaewmate-----.svg | 28 +- milstd2525/icons/war/sfgaewmatr-----.svg | 28 +- milstd2525/icons/war/sfgaewms-------.svg | 28 +- milstd2525/icons/war/sfgaewmsi------.svg | 28 +- milstd2525/icons/war/sfgaewmsl------.svg | 28 +- milstd2525/icons/war/sfgaewmss------.svg | 28 +- milstd2525/icons/war/sfgaewmt-------.svg | 28 +- milstd2525/icons/war/sfgaewmth------.svg | 28 +- milstd2525/icons/war/sfgaewmtl------.svg | 28 +- milstd2525/icons/war/sfgaewmtm------.svg | 28 +- milstd2525/icons/war/sfgaewo--------.svg | 28 +- milstd2525/icons/war/sfgaewoh-------.svg | 28 +- milstd2525/icons/war/sfgaewol-------.svg | 28 +- milstd2525/icons/war/sfgaewom-------.svg | 28 +- milstd2525/icons/war/sfgaewr--------.svg | 28 +- milstd2525/icons/war/sfgaewrh-------.svg | 28 +- milstd2525/icons/war/sfgaewrl-------.svg | 28 +- milstd2525/icons/war/sfgaewrr-------.svg | 28 +- milstd2525/icons/war/sfgaews--------.svg | 28 +- milstd2525/icons/war/sfgaewsh-------.svg | 28 +- milstd2525/icons/war/sfgaewsl-------.svg | 28 +- milstd2525/icons/war/sfgaewsm-------.svg | 28 +- milstd2525/icons/war/sfgaewt--------.svg | 28 +- milstd2525/icons/war/sfgaewth-------.svg | 28 +- milstd2525/icons/war/sfgaewtl-------.svg | 28 +- milstd2525/icons/war/sfgaewtm-------.svg | 28 +- milstd2525/icons/war/sfgaewx--------.svg | 28 +- milstd2525/icons/war/sfgaewxh-------.svg | 28 +- milstd2525/icons/war/sfgaewxl-------.svg | 28 +- milstd2525/icons/war/sfgaewxm-------.svg | 28 +- milstd2525/icons/war/sfgaewz--------.svg | 28 +- milstd2525/icons/war/sfgaewzh-------.svg | 28 +- milstd2525/icons/war/sfgaewzl-------.svg | 28 +- milstd2525/icons/war/sfgaewzm-------.svg | 28 +- milstd2525/icons/war/sfgaexf--------.svg | 28 +- milstd2525/icons/war/sfgaexi--------.svg | 28 +- milstd2525/icons/war/sfgaexl--------.svg | 28 +- milstd2525/icons/war/sfgaexm--------.svg | 28 +- milstd2525/icons/war/sfgaexmc-------.svg | 28 +- milstd2525/icons/war/sfgaexml-------.svg | 28 +- milstd2525/icons/war/sfgaexn--------.svg | 28 +- milstd2525/icons/war/sfgai----------.svg | 28 +- milstd2525/icons/war/sfgaib---------.svg | 28 +- milstd2525/icons/war/sfgaiba--------.svg | 28 +- milstd2525/icons/war/sfgaibn--------.svg | 28 +- milstd2525/icons/war/sfgaie---------.svg | 28 +- milstd2525/icons/war/sfgaig---------.svg | 28 +- milstd2525/icons/war/sfgaima--------.svg | 28 +- milstd2525/icons/war/sfgaimc--------.svg | 28 +- milstd2525/icons/war/sfgaime--------.svg | 28 +- milstd2525/icons/war/sfgaimf--------.svg | 28 +- milstd2525/icons/war/sfgaimfa-------.svg | 28 +- milstd2525/icons/war/sfgaimfp-------.svg | 28 +- milstd2525/icons/war/sfgaimfpw------.svg | 28 +- milstd2525/icons/war/sfgaimfs-------.svg | 28 +- milstd2525/icons/war/sfgaimg--------.svg | 28 +- milstd2525/icons/war/sfgaimm--------.svg | 28 +- milstd2525/icons/war/sfgaimn--------.svg | 28 +- milstd2525/icons/war/sfgaimnb-------.svg | 28 +- milstd2525/icons/war/sfgaims--------.svg | 28 +- milstd2525/icons/war/sfgaimv--------.svg | 28 +- milstd2525/icons/war/sfgaip---------.svg | 28 +- milstd2525/icons/war/sfgaipd--------.svg | 28 +- milstd2525/icons/war/sfgair---------.svg | 28 +- milstd2525/icons/war/sfgairm--------.svg | 28 +- milstd2525/icons/war/sfgairn--------.svg | 28 +- milstd2525/icons/war/sfgairnb-------.svg | 28 +- milstd2525/icons/war/sfgairnc-------.svg | 28 +- milstd2525/icons/war/sfgairnn-------.svg | 28 +- milstd2525/icons/war/sfgairp--------.svg | 28 +- milstd2525/icons/war/sfgait---------.svg | 28 +- milstd2525/icons/war/sfgaiu---------.svg | 28 +- milstd2525/icons/war/sfgaiue--------.svg | 28 +- milstd2525/icons/war/sfgaiued-------.svg | 28 +- milstd2525/icons/war/sfgaiuef-------.svg | 28 +- milstd2525/icons/war/sfgaiuen-------.svg | 28 +- milstd2525/icons/war/sfgaiup--------.svg | 28 +- milstd2525/icons/war/sfgaiur--------.svg | 28 +- milstd2525/icons/war/sfgaiut--------.svg | 28 +- milstd2525/icons/war/sfgaix---------.svg | 28 +- milstd2525/icons/war/sfgaixh--------.svg | 28 +- milstd2525/icons/war/sfgau----------.svg | 28 +- milstd2525/icons/war/sfgauc---------.svg | 28 +- milstd2525/icons/war/sfgauca--------.svg | 28 +- milstd2525/icons/war/sfgaucaa-------.svg | 28 +- milstd2525/icons/war/sfgaucaaa------.svg | 28 +- milstd2525/icons/war/sfgaucaaas-----.svg | 28 +- milstd2525/icons/war/sfgaucaaat-----.svg | 28 +- milstd2525/icons/war/sfgaucaaaw-----.svg | 28 +- milstd2525/icons/war/sfgaucaac------.svg | 28 +- milstd2525/icons/war/sfgaucaad------.svg | 28 +- milstd2525/icons/war/sfgaucaal------.svg | 28 +- milstd2525/icons/war/sfgaucaam------.svg | 28 +- milstd2525/icons/war/sfgaucaao------.svg | 28 +- milstd2525/icons/war/sfgaucaaos-----.svg | 28 +- milstd2525/icons/war/sfgaucaas------.svg | 28 +- milstd2525/icons/war/sfgaucaau------.svg | 28 +- milstd2525/icons/war/sfgaucat-------.svg | 28 +- milstd2525/icons/war/sfgaucata------.svg | 28 +- milstd2525/icons/war/sfgaucath------.svg | 28 +- milstd2525/icons/war/sfgaucatl------.svg | 28 +- milstd2525/icons/war/sfgaucatm------.svg | 28 +- milstd2525/icons/war/sfgaucatr------.svg | 28 +- milstd2525/icons/war/sfgaucatw------.svg | 28 +- milstd2525/icons/war/sfgaucatwr-----.svg | 28 +- milstd2525/icons/war/sfgaucaw-------.svg | 28 +- milstd2525/icons/war/sfgaucawa------.svg | 28 +- milstd2525/icons/war/sfgaucawh------.svg | 28 +- milstd2525/icons/war/sfgaucawl------.svg | 28 +- milstd2525/icons/war/sfgaucawm------.svg | 28 +- milstd2525/icons/war/sfgaucawr------.svg | 28 +- milstd2525/icons/war/sfgaucaws------.svg | 28 +- milstd2525/icons/war/sfgaucaww------.svg | 28 +- milstd2525/icons/war/sfgaucawwr-----.svg | 28 +- milstd2525/icons/war/sfgaucd--------.svg | 28 +- milstd2525/icons/war/sfgaucdc-------.svg | 28 +- milstd2525/icons/war/sfgaucdg-------.svg | 28 +- milstd2525/icons/war/sfgaucdh-------.svg | 28 +- milstd2525/icons/war/sfgaucdhh------.svg | 28 +- milstd2525/icons/war/sfgaucdhp------.svg | 28 +- milstd2525/icons/war/sfgaucdm-------.svg | 28 +- milstd2525/icons/war/sfgaucdmh------.svg | 28 +- milstd2525/icons/war/sfgaucdml------.svg | 28 +- milstd2525/icons/war/sfgaucdmla-----.svg | 28 +- milstd2525/icons/war/sfgaucdmm------.svg | 28 +- milstd2525/icons/war/sfgaucdo-------.svg | 28 +- milstd2525/icons/war/sfgaucds-------.svg | 28 +- milstd2525/icons/war/sfgaucdsc------.svg | 28 +- milstd2525/icons/war/sfgaucdss------.svg | 28 +- milstd2525/icons/war/sfgaucdsv------.svg | 28 +- milstd2525/icons/war/sfgaucdt-------.svg | 28 +- milstd2525/icons/war/sfgauce--------.svg | 28 +- milstd2525/icons/war/sfgaucec-------.svg | 28 +- milstd2525/icons/war/sfgauceca------.svg | 28 +- milstd2525/icons/war/sfgaucecc------.svg | 28 +- milstd2525/icons/war/sfgaucech------.svg | 28 +- milstd2525/icons/war/sfgaucecl------.svg | 28 +- milstd2525/icons/war/sfgaucecm------.svg | 28 +- milstd2525/icons/war/sfgauceco------.svg | 28 +- milstd2525/icons/war/sfgaucecr------.svg | 28 +- milstd2525/icons/war/sfgaucecs------.svg | 28 +- milstd2525/icons/war/sfgaucect------.svg | 28 +- milstd2525/icons/war/sfgaucecw------.svg | 28 +- milstd2525/icons/war/sfgaucen-------.svg | 28 +- milstd2525/icons/war/sfgaucenn------.svg | 28 +- milstd2525/icons/war/sfgaucf--------.svg | 28 +- milstd2525/icons/war/sfgaucfh-------.svg | 28 +- milstd2525/icons/war/sfgaucfha------.svg | 28 +- milstd2525/icons/war/sfgaucfhc------.svg | 28 +- milstd2525/icons/war/sfgaucfhe------.svg | 28 +- milstd2525/icons/war/sfgaucfhh------.svg | 28 +- milstd2525/icons/war/sfgaucfhl------.svg | 28 +- milstd2525/icons/war/sfgaucfhm------.svg | 28 +- milstd2525/icons/war/sfgaucfho------.svg | 28 +- milstd2525/icons/war/sfgaucfhs------.svg | 28 +- milstd2525/icons/war/sfgaucfhx------.svg | 28 +- milstd2525/icons/war/sfgaucfm-------.svg | 28 +- milstd2525/icons/war/sfgaucfml------.svg | 28 +- milstd2525/icons/war/sfgaucfms------.svg | 28 +- milstd2525/icons/war/sfgaucfmt------.svg | 28 +- milstd2525/icons/war/sfgaucfmta-----.svg | 28 +- milstd2525/icons/war/sfgaucfmtc-----.svg | 28 +- milstd2525/icons/war/sfgaucfmto-----.svg | 28 +- milstd2525/icons/war/sfgaucfmts-----.svg | 28 +- milstd2525/icons/war/sfgaucfmw------.svg | 28 +- milstd2525/icons/war/sfgaucfo-------.svg | 28 +- milstd2525/icons/war/sfgaucfoa------.svg | 28 +- milstd2525/icons/war/sfgaucfol------.svg | 28 +- milstd2525/icons/war/sfgaucfoo------.svg | 28 +- milstd2525/icons/war/sfgaucfos------.svg | 28 +- milstd2525/icons/war/sfgaucfr-------.svg | 28 +- milstd2525/icons/war/sfgaucfrm------.svg | 28 +- milstd2525/icons/war/sfgaucfrmr-----.svg | 28 +- milstd2525/icons/war/sfgaucfrms-----.svg | 28 +- milstd2525/icons/war/sfgaucfrmt-----.svg | 28 +- milstd2525/icons/war/sfgaucfrs------.svg | 28 +- milstd2525/icons/war/sfgaucfrsr-----.svg | 28 +- milstd2525/icons/war/sfgaucfrss-----.svg | 28 +- milstd2525/icons/war/sfgaucfrst-----.svg | 28 +- milstd2525/icons/war/sfgaucfs-------.svg | 28 +- milstd2525/icons/war/sfgaucfsa------.svg | 28 +- milstd2525/icons/war/sfgaucfsl------.svg | 28 +- milstd2525/icons/war/sfgaucfso------.svg | 28 +- milstd2525/icons/war/sfgaucfss------.svg | 28 +- milstd2525/icons/war/sfgaucft-------.svg | 28 +- milstd2525/icons/war/sfgaucfta------.svg | 28 +- milstd2525/icons/war/sfgaucftc------.svg | 28 +- milstd2525/icons/war/sfgaucftcd-----.svg | 28 +- milstd2525/icons/war/sfgaucftcm-----.svg | 28 +- milstd2525/icons/war/sfgaucftf------.svg | 28 +- milstd2525/icons/war/sfgaucftr------.svg | 28 +- milstd2525/icons/war/sfgaucfts------.svg | 28 +- milstd2525/icons/war/sfgauci--------.svg | 28 +- milstd2525/icons/war/sfgaucia-------.svg | 28 +- milstd2525/icons/war/sfgaucic-------.svg | 28 +- milstd2525/icons/war/sfgaucii-------.svg | 28 +- milstd2525/icons/war/sfgaucil-------.svg | 28 +- milstd2525/icons/war/sfgaucim-------.svg | 28 +- milstd2525/icons/war/sfgaucin-------.svg | 28 +- milstd2525/icons/war/sfgaucio-------.svg | 28 +- milstd2525/icons/war/sfgaucis-------.svg | 28 +- milstd2525/icons/war/sfgauciz-------.svg | 28 +- milstd2525/icons/war/sfgaucm--------.svg | 28 +- milstd2525/icons/war/sfgaucms-------.svg | 28 +- milstd2525/icons/war/sfgaucmt-------.svg | 28 +- milstd2525/icons/war/sfgaucr--------.svg | 28 +- milstd2525/icons/war/sfgaucra-------.svg | 28 +- milstd2525/icons/war/sfgaucrc-------.svg | 28 +- milstd2525/icons/war/sfgaucrh-------.svg | 28 +- milstd2525/icons/war/sfgaucrl-------.svg | 28 +- milstd2525/icons/war/sfgaucro-------.svg | 28 +- milstd2525/icons/war/sfgaucrr-------.svg | 28 +- milstd2525/icons/war/sfgaucrrd------.svg | 28 +- milstd2525/icons/war/sfgaucrrf------.svg | 28 +- milstd2525/icons/war/sfgaucrrl------.svg | 28 +- milstd2525/icons/war/sfgaucrs-------.svg | 28 +- milstd2525/icons/war/sfgaucrv-------.svg | 28 +- milstd2525/icons/war/sfgaucrva------.svg | 28 +- milstd2525/icons/war/sfgaucrvg------.svg | 28 +- milstd2525/icons/war/sfgaucrvm------.svg | 28 +- milstd2525/icons/war/sfgaucrvo------.svg | 28 +- milstd2525/icons/war/sfgaucrx-------.svg | 28 +- milstd2525/icons/war/sfgaucs--------.svg | 28 +- milstd2525/icons/war/sfgaucsa-------.svg | 28 +- milstd2525/icons/war/sfgaucsg-------.svg | 28 +- milstd2525/icons/war/sfgaucsga------.svg | 28 +- milstd2525/icons/war/sfgaucsgd------.svg | 28 +- milstd2525/icons/war/sfgaucsgm------.svg | 28 +- milstd2525/icons/war/sfgaucsm-------.svg | 28 +- milstd2525/icons/war/sfgaucsr-------.svg | 28 +- milstd2525/icons/war/sfgaucsw-------.svg | 28 +- milstd2525/icons/war/sfgaucv--------.svg | 28 +- milstd2525/icons/war/sfgaucvc-------.svg | 28 +- milstd2525/icons/war/sfgaucvf-------.svg | 28 +- milstd2525/icons/war/sfgaucvfa------.svg | 28 +- milstd2525/icons/war/sfgaucvfr------.svg | 28 +- milstd2525/icons/war/sfgaucvfu------.svg | 28 +- milstd2525/icons/war/sfgaucvr-------.svg | 28 +- milstd2525/icons/war/sfgaucvra------.svg | 28 +- milstd2525/icons/war/sfgaucvrm------.svg | 28 +- milstd2525/icons/war/sfgaucvrs------.svg | 28 +- milstd2525/icons/war/sfgaucvru------.svg | 28 +- milstd2525/icons/war/sfgaucvruc-----.svg | 28 +- milstd2525/icons/war/sfgaucvrue-----.svg | 28 +- milstd2525/icons/war/sfgaucvruh-----.svg | 28 +- milstd2525/icons/war/sfgaucvrul-----.svg | 28 +- milstd2525/icons/war/sfgaucvrum-----.svg | 28 +- milstd2525/icons/war/sfgaucvrw------.svg | 28 +- milstd2525/icons/war/sfgaucvs-------.svg | 28 +- milstd2525/icons/war/sfgaucvu-------.svg | 28 +- milstd2525/icons/war/sfgaucvuf------.svg | 28 +- milstd2525/icons/war/sfgaucvur------.svg | 28 +- milstd2525/icons/war/sfgaucvv-------.svg | 28 +- milstd2525/icons/war/sfgauh---------.svg | 28 +- milstd2525/icons/war/sfgaus---------.svg | 28 +- milstd2525/icons/war/sfgausa--------.svg | 28 +- milstd2525/icons/war/sfgausac-------.svg | 28 +- milstd2525/icons/war/sfgausaf-------.svg | 28 +- milstd2525/icons/war/sfgausafc------.svg | 28 +- milstd2525/icons/war/sfgausaft------.svg | 28 +- milstd2525/icons/war/sfgausaj-------.svg | 28 +- milstd2525/icons/war/sfgausajc------.svg | 28 +- milstd2525/icons/war/sfgausajt------.svg | 28 +- milstd2525/icons/war/sfgausal-------.svg | 28 +- milstd2525/icons/war/sfgausalc------.svg | 28 +- milstd2525/icons/war/sfgausalt------.svg | 28 +- milstd2525/icons/war/sfgausam-------.svg | 28 +- milstd2525/icons/war/sfgausamc------.svg | 28 +- milstd2525/icons/war/sfgausamt------.svg | 28 +- milstd2525/icons/war/sfgausao-------.svg | 28 +- milstd2525/icons/war/sfgausaoc------.svg | 28 +- milstd2525/icons/war/sfgausaot------.svg | 28 +- milstd2525/icons/war/sfgausap-------.svg | 28 +- milstd2525/icons/war/sfgausapb------.svg | 28 +- milstd2525/icons/war/sfgausapbc-----.svg | 28 +- milstd2525/icons/war/sfgausapbt-----.svg | 28 +- milstd2525/icons/war/sfgausapc------.svg | 28 +- milstd2525/icons/war/sfgausapm------.svg | 28 +- milstd2525/icons/war/sfgausapmc-----.svg | 28 +- milstd2525/icons/war/sfgausapmt-----.svg | 28 +- milstd2525/icons/war/sfgausapt------.svg | 28 +- milstd2525/icons/war/sfgausaq-------.svg | 28 +- milstd2525/icons/war/sfgausaqc------.svg | 28 +- milstd2525/icons/war/sfgausaqt------.svg | 28 +- milstd2525/icons/war/sfgausar-------.svg | 28 +- milstd2525/icons/war/sfgausarc------.svg | 28 +- milstd2525/icons/war/sfgausart------.svg | 28 +- milstd2525/icons/war/sfgausas-------.svg | 28 +- milstd2525/icons/war/sfgausasc------.svg | 28 +- milstd2525/icons/war/sfgausast------.svg | 28 +- milstd2525/icons/war/sfgausat-------.svg | 28 +- milstd2525/icons/war/sfgausaw-------.svg | 28 +- milstd2525/icons/war/sfgausawc------.svg | 28 +- milstd2525/icons/war/sfgausawt------.svg | 28 +- milstd2525/icons/war/sfgausax-------.svg | 28 +- milstd2525/icons/war/sfgausaxc------.svg | 28 +- milstd2525/icons/war/sfgausaxt------.svg | 28 +- milstd2525/icons/war/sfgausm--------.svg | 28 +- milstd2525/icons/war/sfgausmc-------.svg | 28 +- milstd2525/icons/war/sfgausmd-------.svg | 28 +- milstd2525/icons/war/sfgausmdc------.svg | 28 +- milstd2525/icons/war/sfgausmdt------.svg | 28 +- milstd2525/icons/war/sfgausmm-------.svg | 28 +- milstd2525/icons/war/sfgausmmc------.svg | 28 +- milstd2525/icons/war/sfgausmmt------.svg | 28 +- milstd2525/icons/war/sfgausmp-------.svg | 28 +- milstd2525/icons/war/sfgausmpc------.svg | 28 +- milstd2525/icons/war/sfgausmpt------.svg | 28 +- milstd2525/icons/war/sfgausmt-------.svg | 28 +- milstd2525/icons/war/sfgausmv-------.svg | 28 +- milstd2525/icons/war/sfgausmvc------.svg | 28 +- milstd2525/icons/war/sfgausmvt------.svg | 28 +- milstd2525/icons/war/sfgauss--------.svg | 28 +- milstd2525/icons/war/sfgauss1-------.svg | 28 +- milstd2525/icons/war/sfgauss1c------.svg | 28 +- milstd2525/icons/war/sfgauss1t------.svg | 28 +- milstd2525/icons/war/sfgauss2-------.svg | 28 +- milstd2525/icons/war/sfgauss2c------.svg | 28 +- milstd2525/icons/war/sfgauss2t------.svg | 28 +- milstd2525/icons/war/sfgauss3-------.svg | 28 +- milstd2525/icons/war/sfgauss3a------.svg | 28 +- milstd2525/icons/war/sfgauss3ac-----.svg | 28 +- milstd2525/icons/war/sfgauss3at-----.svg | 28 +- milstd2525/icons/war/sfgauss3c------.svg | 28 +- milstd2525/icons/war/sfgauss3t------.svg | 28 +- milstd2525/icons/war/sfgauss4-------.svg | 28 +- milstd2525/icons/war/sfgauss4c------.svg | 28 +- milstd2525/icons/war/sfgauss4t------.svg | 28 +- milstd2525/icons/war/sfgauss5-------.svg | 28 +- milstd2525/icons/war/sfgauss5c------.svg | 28 +- milstd2525/icons/war/sfgauss5t------.svg | 28 +- milstd2525/icons/war/sfgauss6-------.svg | 28 +- milstd2525/icons/war/sfgauss6c------.svg | 28 +- milstd2525/icons/war/sfgauss6t------.svg | 28 +- milstd2525/icons/war/sfgauss7-------.svg | 28 +- milstd2525/icons/war/sfgauss7c------.svg | 28 +- milstd2525/icons/war/sfgauss7t------.svg | 28 +- milstd2525/icons/war/sfgauss8-------.svg | 28 +- milstd2525/icons/war/sfgauss8c------.svg | 28 +- milstd2525/icons/war/sfgauss8t------.svg | 28 +- milstd2525/icons/war/sfgauss9-------.svg | 28 +- milstd2525/icons/war/sfgauss9c------.svg | 28 +- milstd2525/icons/war/sfgauss9t------.svg | 28 +- milstd2525/icons/war/sfgaussc-------.svg | 28 +- milstd2525/icons/war/sfgaussl-------.svg | 28 +- milstd2525/icons/war/sfgausslc------.svg | 28 +- milstd2525/icons/war/sfgausslt------.svg | 28 +- milstd2525/icons/war/sfgausst-------.svg | 28 +- milstd2525/icons/war/sfgaussw-------.svg | 28 +- milstd2525/icons/war/sfgausswc------.svg | 28 +- milstd2525/icons/war/sfgausswp------.svg | 28 +- milstd2525/icons/war/sfgausswpc-----.svg | 28 +- milstd2525/icons/war/sfgausswpt-----.svg | 28 +- milstd2525/icons/war/sfgausswt------.svg | 28 +- milstd2525/icons/war/sfgaussx-------.svg | 28 +- milstd2525/icons/war/sfgaussxc------.svg | 28 +- milstd2525/icons/war/sfgaussxt------.svg | 28 +- milstd2525/icons/war/sfgaust--------.svg | 28 +- milstd2525/icons/war/sfgausta-------.svg | 28 +- milstd2525/icons/war/sfgaustac------.svg | 28 +- milstd2525/icons/war/sfgaustat------.svg | 28 +- milstd2525/icons/war/sfgaustc-------.svg | 28 +- milstd2525/icons/war/sfgausti-------.svg | 28 +- milstd2525/icons/war/sfgaustic------.svg | 28 +- milstd2525/icons/war/sfgaustit------.svg | 28 +- milstd2525/icons/war/sfgaustm-------.svg | 28 +- milstd2525/icons/war/sfgaustmc------.svg | 28 +- milstd2525/icons/war/sfgaustmt------.svg | 28 +- milstd2525/icons/war/sfgaustr-------.svg | 28 +- milstd2525/icons/war/sfgaustrc------.svg | 28 +- milstd2525/icons/war/sfgaustrt------.svg | 28 +- milstd2525/icons/war/sfgausts-------.svg | 28 +- milstd2525/icons/war/sfgaustsc------.svg | 28 +- milstd2525/icons/war/sfgaustst------.svg | 28 +- milstd2525/icons/war/sfgaustt-------.svg | 28 +- milstd2525/icons/war/sfgausx--------.svg | 28 +- milstd2525/icons/war/sfgausxc-------.svg | 28 +- milstd2525/icons/war/sfgausxe-------.svg | 28 +- milstd2525/icons/war/sfgausxec------.svg | 28 +- milstd2525/icons/war/sfgausxet------.svg | 28 +- milstd2525/icons/war/sfgausxh-------.svg | 28 +- milstd2525/icons/war/sfgausxhc------.svg | 28 +- milstd2525/icons/war/sfgausxht------.svg | 28 +- milstd2525/icons/war/sfgausxo-------.svg | 28 +- milstd2525/icons/war/sfgausxoc------.svg | 28 +- milstd2525/icons/war/sfgausxom------.svg | 28 +- milstd2525/icons/war/sfgausxomc-----.svg | 28 +- milstd2525/icons/war/sfgausxomt-----.svg | 28 +- milstd2525/icons/war/sfgausxot------.svg | 28 +- milstd2525/icons/war/sfgausxr-------.svg | 28 +- milstd2525/icons/war/sfgausxrc------.svg | 28 +- milstd2525/icons/war/sfgausxrt------.svg | 28 +- milstd2525/icons/war/sfgausxt-------.svg | 28 +- milstd2525/icons/war/sfgauu---------.svg | 28 +- milstd2525/icons/war/sfgauua--------.svg | 28 +- milstd2525/icons/war/sfgauuab-------.svg | 28 +- milstd2525/icons/war/sfgauuabr------.svg | 28 +- milstd2525/icons/war/sfgauuac-------.svg | 28 +- milstd2525/icons/war/sfgauuacc------.svg | 28 +- milstd2525/icons/war/sfgauuacck-----.svg | 28 +- milstd2525/icons/war/sfgauuaccm-----.svg | 28 +- milstd2525/icons/war/sfgauuacr------.svg | 28 +- milstd2525/icons/war/sfgauuacrs-----.svg | 28 +- milstd2525/icons/war/sfgauuacrw-----.svg | 28 +- milstd2525/icons/war/sfgauuacs------.svg | 28 +- milstd2525/icons/war/sfgauuacsa-----.svg | 28 +- milstd2525/icons/war/sfgauuacsm-----.svg | 28 +- milstd2525/icons/war/sfgauuad-------.svg | 28 +- milstd2525/icons/war/sfgauuan-------.svg | 28 +- milstd2525/icons/war/sfgauue--------.svg | 28 +- milstd2525/icons/war/sfgauui--------.svg | 28 +- milstd2525/icons/war/sfgauul--------.svg | 28 +- milstd2525/icons/war/sfgauulc-------.svg | 28 +- milstd2525/icons/war/sfgauuld-------.svg | 28 +- milstd2525/icons/war/sfgauulf-------.svg | 28 +- milstd2525/icons/war/sfgauulm-------.svg | 28 +- milstd2525/icons/war/sfgauuls-------.svg | 28 +- milstd2525/icons/war/sfgauum--------.svg | 28 +- milstd2525/icons/war/sfgauuma-------.svg | 28 +- milstd2525/icons/war/sfgauumc-------.svg | 28 +- milstd2525/icons/war/sfgauumj-------.svg | 28 +- milstd2525/icons/war/sfgauummo------.svg | 28 +- milstd2525/icons/war/sfgauumo-------.svg | 28 +- milstd2525/icons/war/sfgauumq-------.svg | 28 +- milstd2525/icons/war/sfgauumr-------.svg | 28 +- milstd2525/icons/war/sfgauumrg------.svg | 28 +- milstd2525/icons/war/sfgauumrs------.svg | 28 +- milstd2525/icons/war/sfgauumrss-----.svg | 28 +- milstd2525/icons/war/sfgauumrx------.svg | 28 +- milstd2525/icons/war/sfgauums-------.svg | 28 +- milstd2525/icons/war/sfgauumse------.svg | 28 +- milstd2525/icons/war/sfgauumsea-----.svg | 28 +- milstd2525/icons/war/sfgauumsec-----.svg | 28 +- milstd2525/icons/war/sfgauumsed-----.svg | 28 +- milstd2525/icons/war/sfgauumsei-----.svg | 28 +- milstd2525/icons/war/sfgauumsej-----.svg | 28 +- milstd2525/icons/war/sfgauumset-----.svg | 28 +- milstd2525/icons/war/sfgauumt-------.svg | 28 +- milstd2525/icons/war/sfgauup--------.svg | 28 +- milstd2525/icons/war/sfgauus--------.svg | 28 +- milstd2525/icons/war/sfgauusa-------.svg | 28 +- milstd2525/icons/war/sfgauusc-------.svg | 28 +- milstd2525/icons/war/sfgauuscl------.svg | 28 +- milstd2525/icons/war/sfgauusf-------.svg | 28 +- milstd2525/icons/war/sfgauusm-------.svg | 28 +- milstd2525/icons/war/sfgauusml------.svg | 28 +- milstd2525/icons/war/sfgauusmn------.svg | 28 +- milstd2525/icons/war/sfgauusms------.svg | 28 +- milstd2525/icons/war/sfgauuso-------.svg | 28 +- milstd2525/icons/war/sfgauusr-------.svg | 28 +- milstd2525/icons/war/sfgauusrs------.svg | 28 +- milstd2525/icons/war/sfgauusrt------.svg | 28 +- milstd2525/icons/war/sfgauusrw------.svg | 28 +- milstd2525/icons/war/sfgauuss-------.svg | 28 +- milstd2525/icons/war/sfgauusw-------.svg | 28 +- milstd2525/icons/war/sfgauusx-------.svg | 28 +- milstd2525/icons/war/sfgp-----------.svg | 28 +- milstd2525/icons/war/sfgpe----------.svg | 28 +- milstd2525/icons/war/sfgpes---------.svg | 28 +- milstd2525/icons/war/sfgpese--------.svg | 28 +- milstd2525/icons/war/sfgpesr--------.svg | 28 +- milstd2525/icons/war/sfgpev---------.svg | 28 +- milstd2525/icons/war/sfgpeva--------.svg | 28 +- milstd2525/icons/war/sfgpevaa-------.svg | 28 +- milstd2525/icons/war/sfgpevaar------.svg | 28 +- milstd2525/icons/war/sfgpevac-------.svg | 28 +- milstd2525/icons/war/sfgpevai-------.svg | 28 +- milstd2525/icons/war/sfgpeval-------.svg | 28 +- milstd2525/icons/war/sfgpevas-------.svg | 28 +- milstd2525/icons/war/sfgpevat-------.svg | 28 +- milstd2525/icons/war/sfgpevath------.svg | 28 +- milstd2525/icons/war/sfgpevathr-----.svg | 28 +- milstd2525/icons/war/sfgpevatl------.svg | 28 +- milstd2525/icons/war/sfgpevatlr-----.svg | 28 +- milstd2525/icons/war/sfgpevatm------.svg | 28 +- milstd2525/icons/war/sfgpevatmr-----.svg | 28 +- milstd2525/icons/war/sfgpevc--------.svg | 28 +- milstd2525/icons/war/sfgpevca-------.svg | 28 +- milstd2525/icons/war/sfgpevcah------.svg | 28 +- milstd2525/icons/war/sfgpevcal------.svg | 28 +- milstd2525/icons/war/sfgpevcam------.svg | 28 +- milstd2525/icons/war/sfgpevcf-------.svg | 28 +- milstd2525/icons/war/sfgpevcfh------.svg | 28 +- milstd2525/icons/war/sfgpevcfl------.svg | 28 +- milstd2525/icons/war/sfgpevcfm------.svg | 28 +- milstd2525/icons/war/sfgpevcj-------.svg | 28 +- milstd2525/icons/war/sfgpevcjh------.svg | 28 +- milstd2525/icons/war/sfgpevcjl------.svg | 28 +- milstd2525/icons/war/sfgpevcjm------.svg | 28 +- milstd2525/icons/war/sfgpevcm-------.svg | 28 +- milstd2525/icons/war/sfgpevcmh------.svg | 28 +- milstd2525/icons/war/sfgpevcml------.svg | 28 +- milstd2525/icons/war/sfgpevcmm------.svg | 28 +- milstd2525/icons/war/sfgpevco-------.svg | 28 +- milstd2525/icons/war/sfgpevcoh------.svg | 28 +- milstd2525/icons/war/sfgpevcol------.svg | 28 +- milstd2525/icons/war/sfgpevcom------.svg | 28 +- milstd2525/icons/war/sfgpevct-------.svg | 28 +- milstd2525/icons/war/sfgpevcth------.svg | 28 +- milstd2525/icons/war/sfgpevctl------.svg | 28 +- milstd2525/icons/war/sfgpevctm------.svg | 28 +- milstd2525/icons/war/sfgpevcu-------.svg | 28 +- milstd2525/icons/war/sfgpevcuh------.svg | 28 +- milstd2525/icons/war/sfgpevcul------.svg | 28 +- milstd2525/icons/war/sfgpevcum------.svg | 28 +- milstd2525/icons/war/sfgpeve--------.svg | 28 +- milstd2525/icons/war/sfgpevea-------.svg | 28 +- milstd2525/icons/war/sfgpeveaa------.svg | 28 +- milstd2525/icons/war/sfgpeveat------.svg | 28 +- milstd2525/icons/war/sfgpeveb-------.svg | 28 +- milstd2525/icons/war/sfgpevec-------.svg | 28 +- milstd2525/icons/war/sfgpeved-------.svg | 28 +- milstd2525/icons/war/sfgpeveda------.svg | 28 +- milstd2525/icons/war/sfgpevee-------.svg | 28 +- milstd2525/icons/war/sfgpevef-------.svg | 28 +- milstd2525/icons/war/sfgpeveh-------.svg | 28 +- milstd2525/icons/war/sfgpevem-------.svg | 28 +- milstd2525/icons/war/sfgpeveml------.svg | 28 +- milstd2525/icons/war/sfgpevemv------.svg | 28 +- milstd2525/icons/war/sfgpever-------.svg | 28 +- milstd2525/icons/war/sfgpeves-------.svg | 28 +- milstd2525/icons/war/sfgpevm--------.svg | 28 +- milstd2525/icons/war/sfgpevs--------.svg | 28 +- milstd2525/icons/war/sfgpevsc-------.svg | 28 +- milstd2525/icons/war/sfgpevsp-------.svg | 28 +- milstd2525/icons/war/sfgpevsr-------.svg | 28 +- milstd2525/icons/war/sfgpevst-------.svg | 28 +- milstd2525/icons/war/sfgpevsw-------.svg | 28 +- milstd2525/icons/war/sfgpevt--------.svg | 28 +- milstd2525/icons/war/sfgpevu--------.svg | 28 +- milstd2525/icons/war/sfgpevua-------.svg | 28 +- milstd2525/icons/war/sfgpevuaa------.svg | 28 +- milstd2525/icons/war/sfgpevub-------.svg | 28 +- milstd2525/icons/war/sfgpevul-------.svg | 28 +- milstd2525/icons/war/sfgpevur-------.svg | 28 +- milstd2525/icons/war/sfgpevus-------.svg | 28 +- milstd2525/icons/war/sfgpevush------.svg | 28 +- milstd2525/icons/war/sfgpevusl------.svg | 28 +- milstd2525/icons/war/sfgpevusm------.svg | 28 +- milstd2525/icons/war/sfgpevut-------.svg | 28 +- milstd2525/icons/war/sfgpevuth------.svg | 28 +- milstd2525/icons/war/sfgpevutl------.svg | 28 +- milstd2525/icons/war/sfgpevux-------.svg | 28 +- milstd2525/icons/war/sfgpewa--------.svg | 28 +- milstd2525/icons/war/sfgpewah-------.svg | 28 +- milstd2525/icons/war/sfgpewal-------.svg | 28 +- milstd2525/icons/war/sfgpewam-------.svg | 28 +- milstd2525/icons/war/sfgpewd--------.svg | 28 +- milstd2525/icons/war/sfgpewdh-------.svg | 28 +- milstd2525/icons/war/sfgpewdhs------.svg | 28 +- milstd2525/icons/war/sfgpewdl-------.svg | 28 +- milstd2525/icons/war/sfgpewdls------.svg | 28 +- milstd2525/icons/war/sfgpewdm-------.svg | 28 +- milstd2525/icons/war/sfgpewdms------.svg | 28 +- milstd2525/icons/war/sfgpewg--------.svg | 28 +- milstd2525/icons/war/sfgpewgh-------.svg | 28 +- milstd2525/icons/war/sfgpewgl-------.svg | 28 +- milstd2525/icons/war/sfgpewgm-------.svg | 28 +- milstd2525/icons/war/sfgpewgr-------.svg | 28 +- milstd2525/icons/war/sfgpewh--------.svg | 28 +- milstd2525/icons/war/sfgpewhh-------.svg | 28 +- milstd2525/icons/war/sfgpewhhs------.svg | 28 +- milstd2525/icons/war/sfgpewhl-------.svg | 28 +- milstd2525/icons/war/sfgpewhls------.svg | 28 +- milstd2525/icons/war/sfgpewhm-------.svg | 28 +- milstd2525/icons/war/sfgpewhms------.svg | 28 +- milstd2525/icons/war/sfgpewm--------.svg | 28 +- milstd2525/icons/war/sfgpewma-------.svg | 28 +- milstd2525/icons/war/sfgpewmai------.svg | 28 +- milstd2525/icons/war/sfgpewmaie-----.svg | 28 +- milstd2525/icons/war/sfgpewmair-----.svg | 28 +- milstd2525/icons/war/sfgpewmal------.svg | 28 +- milstd2525/icons/war/sfgpewmale-----.svg | 28 +- milstd2525/icons/war/sfgpewmalr-----.svg | 28 +- milstd2525/icons/war/sfgpewmas------.svg | 28 +- milstd2525/icons/war/sfgpewmase-----.svg | 28 +- milstd2525/icons/war/sfgpewmasr-----.svg | 28 +- milstd2525/icons/war/sfgpewmat------.svg | 28 +- milstd2525/icons/war/sfgpewmate-----.svg | 28 +- milstd2525/icons/war/sfgpewmatr-----.svg | 28 +- milstd2525/icons/war/sfgpewms-------.svg | 28 +- milstd2525/icons/war/sfgpewmsi------.svg | 28 +- milstd2525/icons/war/sfgpewmsl------.svg | 28 +- milstd2525/icons/war/sfgpewmss------.svg | 28 +- milstd2525/icons/war/sfgpewmt-------.svg | 28 +- milstd2525/icons/war/sfgpewmth------.svg | 28 +- milstd2525/icons/war/sfgpewmtl------.svg | 28 +- milstd2525/icons/war/sfgpewmtm------.svg | 28 +- milstd2525/icons/war/sfgpewo--------.svg | 28 +- milstd2525/icons/war/sfgpewoh-------.svg | 28 +- milstd2525/icons/war/sfgpewol-------.svg | 28 +- milstd2525/icons/war/sfgpewom-------.svg | 28 +- milstd2525/icons/war/sfgpewr--------.svg | 28 +- milstd2525/icons/war/sfgpewrh-------.svg | 28 +- milstd2525/icons/war/sfgpewrl-------.svg | 28 +- milstd2525/icons/war/sfgpewrr-------.svg | 28 +- milstd2525/icons/war/sfgpews--------.svg | 28 +- milstd2525/icons/war/sfgpewsh-------.svg | 28 +- milstd2525/icons/war/sfgpewsl-------.svg | 28 +- milstd2525/icons/war/sfgpewsm-------.svg | 28 +- milstd2525/icons/war/sfgpewt--------.svg | 28 +- milstd2525/icons/war/sfgpewth-------.svg | 28 +- milstd2525/icons/war/sfgpewtl-------.svg | 28 +- milstd2525/icons/war/sfgpewtm-------.svg | 28 +- milstd2525/icons/war/sfgpewx--------.svg | 28 +- milstd2525/icons/war/sfgpewxh-------.svg | 28 +- milstd2525/icons/war/sfgpewxl-------.svg | 28 +- milstd2525/icons/war/sfgpewxm-------.svg | 28 +- milstd2525/icons/war/sfgpewz--------.svg | 28 +- milstd2525/icons/war/sfgpewzh-------.svg | 28 +- milstd2525/icons/war/sfgpewzl-------.svg | 28 +- milstd2525/icons/war/sfgpewzm-------.svg | 28 +- milstd2525/icons/war/sfgpexf--------.svg | 28 +- milstd2525/icons/war/sfgpexi--------.svg | 28 +- milstd2525/icons/war/sfgpexl--------.svg | 28 +- milstd2525/icons/war/sfgpexm--------.svg | 28 +- milstd2525/icons/war/sfgpexmc-------.svg | 28 +- milstd2525/icons/war/sfgpexml-------.svg | 28 +- milstd2525/icons/war/sfgpexn--------.svg | 28 +- milstd2525/icons/war/sfgpi----------.svg | 28 +- milstd2525/icons/war/sfgpib---------.svg | 28 +- milstd2525/icons/war/sfgpiba--------.svg | 28 +- milstd2525/icons/war/sfgpibn--------.svg | 28 +- milstd2525/icons/war/sfgpie---------.svg | 28 +- milstd2525/icons/war/sfgpig---------.svg | 28 +- milstd2525/icons/war/sfgpima--------.svg | 28 +- milstd2525/icons/war/sfgpimc--------.svg | 28 +- milstd2525/icons/war/sfgpime--------.svg | 28 +- milstd2525/icons/war/sfgpimf--------.svg | 28 +- milstd2525/icons/war/sfgpimfa-------.svg | 28 +- milstd2525/icons/war/sfgpimfp-------.svg | 28 +- milstd2525/icons/war/sfgpimfpw------.svg | 28 +- milstd2525/icons/war/sfgpimfs-------.svg | 28 +- milstd2525/icons/war/sfgpimg--------.svg | 28 +- milstd2525/icons/war/sfgpimm--------.svg | 28 +- milstd2525/icons/war/sfgpimn--------.svg | 28 +- milstd2525/icons/war/sfgpimnb-------.svg | 28 +- milstd2525/icons/war/sfgpims--------.svg | 28 +- milstd2525/icons/war/sfgpimv--------.svg | 28 +- milstd2525/icons/war/sfgpip---------.svg | 28 +- milstd2525/icons/war/sfgpipd--------.svg | 28 +- milstd2525/icons/war/sfgpir---------.svg | 28 +- milstd2525/icons/war/sfgpirm--------.svg | 28 +- milstd2525/icons/war/sfgpirn--------.svg | 28 +- milstd2525/icons/war/sfgpirnb-------.svg | 28 +- milstd2525/icons/war/sfgpirnc-------.svg | 28 +- milstd2525/icons/war/sfgpirnn-------.svg | 28 +- milstd2525/icons/war/sfgpirp--------.svg | 28 +- milstd2525/icons/war/sfgpit---------.svg | 28 +- milstd2525/icons/war/sfgpiu---------.svg | 28 +- milstd2525/icons/war/sfgpiue--------.svg | 28 +- milstd2525/icons/war/sfgpiued-------.svg | 28 +- milstd2525/icons/war/sfgpiuef-------.svg | 28 +- milstd2525/icons/war/sfgpiuen-------.svg | 28 +- milstd2525/icons/war/sfgpiup--------.svg | 28 +- milstd2525/icons/war/sfgpiur--------.svg | 28 +- milstd2525/icons/war/sfgpiut--------.svg | 28 +- milstd2525/icons/war/sfgpix---------.svg | 28 +- milstd2525/icons/war/sfgpixh--------.svg | 28 +- milstd2525/icons/war/sfgpu----------.svg | 28 +- milstd2525/icons/war/sfgpuc---------.svg | 28 +- milstd2525/icons/war/sfgpuca--------.svg | 28 +- milstd2525/icons/war/sfgpucaa-------.svg | 28 +- milstd2525/icons/war/sfgpucaaa------.svg | 28 +- milstd2525/icons/war/sfgpucaaas-----.svg | 28 +- milstd2525/icons/war/sfgpucaaat-----.svg | 28 +- milstd2525/icons/war/sfgpucaaaw-----.svg | 28 +- milstd2525/icons/war/sfgpucaac------.svg | 28 +- milstd2525/icons/war/sfgpucaad------.svg | 28 +- milstd2525/icons/war/sfgpucaal------.svg | 28 +- milstd2525/icons/war/sfgpucaam------.svg | 28 +- milstd2525/icons/war/sfgpucaao------.svg | 28 +- milstd2525/icons/war/sfgpucaaos-----.svg | 28 +- milstd2525/icons/war/sfgpucaas------.svg | 28 +- milstd2525/icons/war/sfgpucaau------.svg | 28 +- milstd2525/icons/war/sfgpucat-------.svg | 28 +- milstd2525/icons/war/sfgpucata------.svg | 28 +- milstd2525/icons/war/sfgpucath------.svg | 28 +- milstd2525/icons/war/sfgpucatl------.svg | 28 +- milstd2525/icons/war/sfgpucatm------.svg | 28 +- milstd2525/icons/war/sfgpucatr------.svg | 28 +- milstd2525/icons/war/sfgpucatw------.svg | 28 +- milstd2525/icons/war/sfgpucatwr-----.svg | 28 +- milstd2525/icons/war/sfgpucaw-------.svg | 28 +- milstd2525/icons/war/sfgpucawa------.svg | 28 +- milstd2525/icons/war/sfgpucawh------.svg | 28 +- milstd2525/icons/war/sfgpucawl------.svg | 28 +- milstd2525/icons/war/sfgpucawm------.svg | 28 +- milstd2525/icons/war/sfgpucawr------.svg | 28 +- milstd2525/icons/war/sfgpucaws------.svg | 28 +- milstd2525/icons/war/sfgpucaww------.svg | 28 +- milstd2525/icons/war/sfgpucawwr-----.svg | 28 +- milstd2525/icons/war/sfgpucd--------.svg | 28 +- milstd2525/icons/war/sfgpucdc-------.svg | 28 +- milstd2525/icons/war/sfgpucdg-------.svg | 28 +- milstd2525/icons/war/sfgpucdh-------.svg | 28 +- milstd2525/icons/war/sfgpucdhh------.svg | 28 +- milstd2525/icons/war/sfgpucdhp------.svg | 28 +- milstd2525/icons/war/sfgpucdm-------.svg | 28 +- milstd2525/icons/war/sfgpucdmh------.svg | 28 +- milstd2525/icons/war/sfgpucdml------.svg | 28 +- milstd2525/icons/war/sfgpucdmla-----.svg | 28 +- milstd2525/icons/war/sfgpucdmm------.svg | 28 +- milstd2525/icons/war/sfgpucdo-------.svg | 28 +- milstd2525/icons/war/sfgpucds-------.svg | 28 +- milstd2525/icons/war/sfgpucdsc------.svg | 28 +- milstd2525/icons/war/sfgpucdss------.svg | 28 +- milstd2525/icons/war/sfgpucdsv------.svg | 28 +- milstd2525/icons/war/sfgpucdt-------.svg | 28 +- milstd2525/icons/war/sfgpuce--------.svg | 28 +- milstd2525/icons/war/sfgpucec-------.svg | 28 +- milstd2525/icons/war/sfgpuceca------.svg | 28 +- milstd2525/icons/war/sfgpucecc------.svg | 28 +- milstd2525/icons/war/sfgpucech------.svg | 28 +- milstd2525/icons/war/sfgpucecl------.svg | 28 +- milstd2525/icons/war/sfgpucecm------.svg | 28 +- milstd2525/icons/war/sfgpuceco------.svg | 28 +- milstd2525/icons/war/sfgpucecr------.svg | 28 +- milstd2525/icons/war/sfgpucecs------.svg | 28 +- milstd2525/icons/war/sfgpucect------.svg | 28 +- milstd2525/icons/war/sfgpucecw------.svg | 28 +- milstd2525/icons/war/sfgpucen-------.svg | 28 +- milstd2525/icons/war/sfgpucenn------.svg | 28 +- milstd2525/icons/war/sfgpucf--------.svg | 28 +- milstd2525/icons/war/sfgpucfh-------.svg | 28 +- milstd2525/icons/war/sfgpucfha------.svg | 28 +- milstd2525/icons/war/sfgpucfhc------.svg | 28 +- milstd2525/icons/war/sfgpucfhe------.svg | 28 +- milstd2525/icons/war/sfgpucfhh------.svg | 28 +- milstd2525/icons/war/sfgpucfhl------.svg | 28 +- milstd2525/icons/war/sfgpucfhm------.svg | 28 +- milstd2525/icons/war/sfgpucfho------.svg | 28 +- milstd2525/icons/war/sfgpucfhs------.svg | 28 +- milstd2525/icons/war/sfgpucfhx------.svg | 28 +- milstd2525/icons/war/sfgpucfm-------.svg | 28 +- milstd2525/icons/war/sfgpucfml------.svg | 28 +- milstd2525/icons/war/sfgpucfms------.svg | 28 +- milstd2525/icons/war/sfgpucfmt------.svg | 28 +- milstd2525/icons/war/sfgpucfmta-----.svg | 28 +- milstd2525/icons/war/sfgpucfmtc-----.svg | 28 +- milstd2525/icons/war/sfgpucfmto-----.svg | 28 +- milstd2525/icons/war/sfgpucfmts-----.svg | 28 +- milstd2525/icons/war/sfgpucfmw------.svg | 28 +- milstd2525/icons/war/sfgpucfo-------.svg | 28 +- milstd2525/icons/war/sfgpucfoa------.svg | 28 +- milstd2525/icons/war/sfgpucfol------.svg | 28 +- milstd2525/icons/war/sfgpucfoo------.svg | 28 +- milstd2525/icons/war/sfgpucfos------.svg | 28 +- milstd2525/icons/war/sfgpucfr-------.svg | 28 +- milstd2525/icons/war/sfgpucfrm------.svg | 28 +- milstd2525/icons/war/sfgpucfrmr-----.svg | 28 +- milstd2525/icons/war/sfgpucfrms-----.svg | 28 +- milstd2525/icons/war/sfgpucfrmt-----.svg | 28 +- milstd2525/icons/war/sfgpucfrs------.svg | 28 +- milstd2525/icons/war/sfgpucfrsr-----.svg | 28 +- milstd2525/icons/war/sfgpucfrss-----.svg | 28 +- milstd2525/icons/war/sfgpucfrst-----.svg | 28 +- milstd2525/icons/war/sfgpucfs-------.svg | 28 +- milstd2525/icons/war/sfgpucfsa------.svg | 28 +- milstd2525/icons/war/sfgpucfsl------.svg | 28 +- milstd2525/icons/war/sfgpucfso------.svg | 28 +- milstd2525/icons/war/sfgpucfss------.svg | 28 +- milstd2525/icons/war/sfgpucft-------.svg | 28 +- milstd2525/icons/war/sfgpucfta------.svg | 28 +- milstd2525/icons/war/sfgpucftc------.svg | 28 +- milstd2525/icons/war/sfgpucftcd-----.svg | 28 +- milstd2525/icons/war/sfgpucftcm-----.svg | 28 +- milstd2525/icons/war/sfgpucftf------.svg | 28 +- milstd2525/icons/war/sfgpucftr------.svg | 28 +- milstd2525/icons/war/sfgpucfts------.svg | 28 +- milstd2525/icons/war/sfgpuci--------.svg | 28 +- milstd2525/icons/war/sfgpucia-------.svg | 28 +- milstd2525/icons/war/sfgpucic-------.svg | 28 +- milstd2525/icons/war/sfgpucii-------.svg | 28 +- milstd2525/icons/war/sfgpucil-------.svg | 28 +- milstd2525/icons/war/sfgpucim-------.svg | 28 +- milstd2525/icons/war/sfgpucin-------.svg | 28 +- milstd2525/icons/war/sfgpucio-------.svg | 28 +- milstd2525/icons/war/sfgpucis-------.svg | 28 +- milstd2525/icons/war/sfgpuciz-------.svg | 28 +- milstd2525/icons/war/sfgpucm--------.svg | 28 +- milstd2525/icons/war/sfgpucms-------.svg | 28 +- milstd2525/icons/war/sfgpucmt-------.svg | 28 +- milstd2525/icons/war/sfgpucr--------.svg | 28 +- milstd2525/icons/war/sfgpucra-------.svg | 28 +- milstd2525/icons/war/sfgpucrc-------.svg | 28 +- milstd2525/icons/war/sfgpucrh-------.svg | 28 +- milstd2525/icons/war/sfgpucrl-------.svg | 28 +- milstd2525/icons/war/sfgpucro-------.svg | 28 +- milstd2525/icons/war/sfgpucrr-------.svg | 28 +- milstd2525/icons/war/sfgpucrrd------.svg | 28 +- milstd2525/icons/war/sfgpucrrf------.svg | 28 +- milstd2525/icons/war/sfgpucrrl------.svg | 28 +- milstd2525/icons/war/sfgpucrs-------.svg | 28 +- milstd2525/icons/war/sfgpucrv-------.svg | 28 +- milstd2525/icons/war/sfgpucrva------.svg | 28 +- milstd2525/icons/war/sfgpucrvg------.svg | 28 +- milstd2525/icons/war/sfgpucrvm------.svg | 28 +- milstd2525/icons/war/sfgpucrvo------.svg | 28 +- milstd2525/icons/war/sfgpucrx-------.svg | 28 +- milstd2525/icons/war/sfgpucs--------.svg | 28 +- milstd2525/icons/war/sfgpucsa-------.svg | 28 +- milstd2525/icons/war/sfgpucsg-------.svg | 28 +- milstd2525/icons/war/sfgpucsga------.svg | 28 +- milstd2525/icons/war/sfgpucsgd------.svg | 28 +- milstd2525/icons/war/sfgpucsgm------.svg | 28 +- milstd2525/icons/war/sfgpucsm-------.svg | 28 +- milstd2525/icons/war/sfgpucsr-------.svg | 28 +- milstd2525/icons/war/sfgpucsw-------.svg | 28 +- milstd2525/icons/war/sfgpucv--------.svg | 28 +- milstd2525/icons/war/sfgpucvc-------.svg | 28 +- milstd2525/icons/war/sfgpucvf-------.svg | 28 +- milstd2525/icons/war/sfgpucvfa------.svg | 28 +- milstd2525/icons/war/sfgpucvfr------.svg | 28 +- milstd2525/icons/war/sfgpucvfu------.svg | 28 +- milstd2525/icons/war/sfgpucvr-------.svg | 28 +- milstd2525/icons/war/sfgpucvra------.svg | 28 +- milstd2525/icons/war/sfgpucvrm------.svg | 28 +- milstd2525/icons/war/sfgpucvrs------.svg | 28 +- milstd2525/icons/war/sfgpucvru------.svg | 28 +- milstd2525/icons/war/sfgpucvruc-----.svg | 28 +- milstd2525/icons/war/sfgpucvrue-----.svg | 28 +- milstd2525/icons/war/sfgpucvruh-----.svg | 28 +- milstd2525/icons/war/sfgpucvrul-----.svg | 28 +- milstd2525/icons/war/sfgpucvrum-----.svg | 28 +- milstd2525/icons/war/sfgpucvrw------.svg | 28 +- milstd2525/icons/war/sfgpucvs-------.svg | 28 +- milstd2525/icons/war/sfgpucvu-------.svg | 28 +- milstd2525/icons/war/sfgpucvuf------.svg | 28 +- milstd2525/icons/war/sfgpucvur------.svg | 28 +- milstd2525/icons/war/sfgpucvv-------.svg | 28 +- milstd2525/icons/war/sfgpuh---------.svg | 28 +- milstd2525/icons/war/sfgpus---------.svg | 28 +- milstd2525/icons/war/sfgpusa--------.svg | 28 +- milstd2525/icons/war/sfgpusac-------.svg | 28 +- milstd2525/icons/war/sfgpusaf-------.svg | 28 +- milstd2525/icons/war/sfgpusafc------.svg | 28 +- milstd2525/icons/war/sfgpusaft------.svg | 28 +- milstd2525/icons/war/sfgpusaj-------.svg | 28 +- milstd2525/icons/war/sfgpusajc------.svg | 28 +- milstd2525/icons/war/sfgpusajt------.svg | 28 +- milstd2525/icons/war/sfgpusal-------.svg | 28 +- milstd2525/icons/war/sfgpusalc------.svg | 28 +- milstd2525/icons/war/sfgpusalt------.svg | 28 +- milstd2525/icons/war/sfgpusam-------.svg | 28 +- milstd2525/icons/war/sfgpusamc------.svg | 28 +- milstd2525/icons/war/sfgpusamt------.svg | 28 +- milstd2525/icons/war/sfgpusao-------.svg | 28 +- milstd2525/icons/war/sfgpusaoc------.svg | 28 +- milstd2525/icons/war/sfgpusaot------.svg | 28 +- milstd2525/icons/war/sfgpusap-------.svg | 28 +- milstd2525/icons/war/sfgpusapb------.svg | 28 +- milstd2525/icons/war/sfgpusapbc-----.svg | 28 +- milstd2525/icons/war/sfgpusapbt-----.svg | 28 +- milstd2525/icons/war/sfgpusapc------.svg | 28 +- milstd2525/icons/war/sfgpusapm------.svg | 28 +- milstd2525/icons/war/sfgpusapmc-----.svg | 28 +- milstd2525/icons/war/sfgpusapmt-----.svg | 28 +- milstd2525/icons/war/sfgpusapt------.svg | 28 +- milstd2525/icons/war/sfgpusaq-------.svg | 28 +- milstd2525/icons/war/sfgpusaqc------.svg | 28 +- milstd2525/icons/war/sfgpusaqt------.svg | 28 +- milstd2525/icons/war/sfgpusar-------.svg | 28 +- milstd2525/icons/war/sfgpusarc------.svg | 28 +- milstd2525/icons/war/sfgpusart------.svg | 28 +- milstd2525/icons/war/sfgpusas-------.svg | 28 +- milstd2525/icons/war/sfgpusasc------.svg | 28 +- milstd2525/icons/war/sfgpusast------.svg | 28 +- milstd2525/icons/war/sfgpusat-------.svg | 28 +- milstd2525/icons/war/sfgpusaw-------.svg | 28 +- milstd2525/icons/war/sfgpusawc------.svg | 28 +- milstd2525/icons/war/sfgpusawt------.svg | 28 +- milstd2525/icons/war/sfgpusax-------.svg | 28 +- milstd2525/icons/war/sfgpusaxc------.svg | 28 +- milstd2525/icons/war/sfgpusaxt------.svg | 28 +- milstd2525/icons/war/sfgpusm--------.svg | 28 +- milstd2525/icons/war/sfgpusmc-------.svg | 28 +- milstd2525/icons/war/sfgpusmd-------.svg | 28 +- milstd2525/icons/war/sfgpusmdc------.svg | 28 +- milstd2525/icons/war/sfgpusmdt------.svg | 28 +- milstd2525/icons/war/sfgpusmm-------.svg | 28 +- milstd2525/icons/war/sfgpusmmc------.svg | 28 +- milstd2525/icons/war/sfgpusmmt------.svg | 28 +- milstd2525/icons/war/sfgpusmp-------.svg | 28 +- milstd2525/icons/war/sfgpusmpc------.svg | 28 +- milstd2525/icons/war/sfgpusmpt------.svg | 28 +- milstd2525/icons/war/sfgpusmt-------.svg | 28 +- milstd2525/icons/war/sfgpusmv-------.svg | 28 +- milstd2525/icons/war/sfgpusmvc------.svg | 28 +- milstd2525/icons/war/sfgpusmvt------.svg | 28 +- milstd2525/icons/war/sfgpuss--------.svg | 28 +- milstd2525/icons/war/sfgpuss1-------.svg | 28 +- milstd2525/icons/war/sfgpuss1c------.svg | 28 +- milstd2525/icons/war/sfgpuss1t------.svg | 28 +- milstd2525/icons/war/sfgpuss2-------.svg | 28 +- milstd2525/icons/war/sfgpuss2c------.svg | 28 +- milstd2525/icons/war/sfgpuss2t------.svg | 28 +- milstd2525/icons/war/sfgpuss3-------.svg | 28 +- milstd2525/icons/war/sfgpuss3a------.svg | 28 +- milstd2525/icons/war/sfgpuss3ac-----.svg | 28 +- milstd2525/icons/war/sfgpuss3at-----.svg | 28 +- milstd2525/icons/war/sfgpuss3c------.svg | 28 +- milstd2525/icons/war/sfgpuss3t------.svg | 28 +- milstd2525/icons/war/sfgpuss4-------.svg | 28 +- milstd2525/icons/war/sfgpuss4c------.svg | 28 +- milstd2525/icons/war/sfgpuss4t------.svg | 28 +- milstd2525/icons/war/sfgpuss5-------.svg | 28 +- milstd2525/icons/war/sfgpuss5c------.svg | 28 +- milstd2525/icons/war/sfgpuss5t------.svg | 28 +- milstd2525/icons/war/sfgpuss6-------.svg | 28 +- milstd2525/icons/war/sfgpuss6c------.svg | 28 +- milstd2525/icons/war/sfgpuss6t------.svg | 28 +- milstd2525/icons/war/sfgpuss7-------.svg | 28 +- milstd2525/icons/war/sfgpuss7c------.svg | 28 +- milstd2525/icons/war/sfgpuss7t------.svg | 28 +- milstd2525/icons/war/sfgpuss8-------.svg | 28 +- milstd2525/icons/war/sfgpuss8c------.svg | 28 +- milstd2525/icons/war/sfgpuss8t------.svg | 28 +- milstd2525/icons/war/sfgpuss9-------.svg | 28 +- milstd2525/icons/war/sfgpuss9c------.svg | 28 +- milstd2525/icons/war/sfgpuss9t------.svg | 28 +- milstd2525/icons/war/sfgpussc-------.svg | 28 +- milstd2525/icons/war/sfgpussl-------.svg | 28 +- milstd2525/icons/war/sfgpusslc------.svg | 28 +- milstd2525/icons/war/sfgpusslt------.svg | 28 +- milstd2525/icons/war/sfgpusst-------.svg | 28 +- milstd2525/icons/war/sfgpussw-------.svg | 28 +- milstd2525/icons/war/sfgpusswc------.svg | 28 +- milstd2525/icons/war/sfgpusswp------.svg | 28 +- milstd2525/icons/war/sfgpusswpc-----.svg | 28 +- milstd2525/icons/war/sfgpusswpt-----.svg | 28 +- milstd2525/icons/war/sfgpusswt------.svg | 28 +- milstd2525/icons/war/sfgpussx-------.svg | 28 +- milstd2525/icons/war/sfgpussxc------.svg | 28 +- milstd2525/icons/war/sfgpussxt------.svg | 28 +- milstd2525/icons/war/sfgpust--------.svg | 28 +- milstd2525/icons/war/sfgpusta-------.svg | 28 +- milstd2525/icons/war/sfgpustac------.svg | 28 +- milstd2525/icons/war/sfgpustat------.svg | 28 +- milstd2525/icons/war/sfgpustc-------.svg | 28 +- milstd2525/icons/war/sfgpusti-------.svg | 28 +- milstd2525/icons/war/sfgpustic------.svg | 28 +- milstd2525/icons/war/sfgpustit------.svg | 28 +- milstd2525/icons/war/sfgpustm-------.svg | 28 +- milstd2525/icons/war/sfgpustmc------.svg | 28 +- milstd2525/icons/war/sfgpustmt------.svg | 28 +- milstd2525/icons/war/sfgpustr-------.svg | 28 +- milstd2525/icons/war/sfgpustrc------.svg | 28 +- milstd2525/icons/war/sfgpustrt------.svg | 28 +- milstd2525/icons/war/sfgpusts-------.svg | 28 +- milstd2525/icons/war/sfgpustsc------.svg | 28 +- milstd2525/icons/war/sfgpustst------.svg | 28 +- milstd2525/icons/war/sfgpustt-------.svg | 28 +- milstd2525/icons/war/sfgpusx--------.svg | 28 +- milstd2525/icons/war/sfgpusxc-------.svg | 28 +- milstd2525/icons/war/sfgpusxe-------.svg | 28 +- milstd2525/icons/war/sfgpusxec------.svg | 28 +- milstd2525/icons/war/sfgpusxet------.svg | 28 +- milstd2525/icons/war/sfgpusxh-------.svg | 28 +- milstd2525/icons/war/sfgpusxhc------.svg | 28 +- milstd2525/icons/war/sfgpusxht------.svg | 28 +- milstd2525/icons/war/sfgpusxo-------.svg | 28 +- milstd2525/icons/war/sfgpusxoc------.svg | 28 +- milstd2525/icons/war/sfgpusxom------.svg | 28 +- milstd2525/icons/war/sfgpusxomc-----.svg | 28 +- milstd2525/icons/war/sfgpusxomt-----.svg | 28 +- milstd2525/icons/war/sfgpusxot------.svg | 28 +- milstd2525/icons/war/sfgpusxr-------.svg | 28 +- milstd2525/icons/war/sfgpusxrc------.svg | 28 +- milstd2525/icons/war/sfgpusxrt------.svg | 28 +- milstd2525/icons/war/sfgpusxt-------.svg | 28 +- milstd2525/icons/war/sfgpuu---------.svg | 28 +- milstd2525/icons/war/sfgpuua--------.svg | 28 +- milstd2525/icons/war/sfgpuuab-------.svg | 28 +- milstd2525/icons/war/sfgpuuabr------.svg | 28 +- milstd2525/icons/war/sfgpuuac-------.svg | 28 +- milstd2525/icons/war/sfgpuuacc------.svg | 28 +- milstd2525/icons/war/sfgpuuacck-----.svg | 28 +- milstd2525/icons/war/sfgpuuaccm-----.svg | 28 +- milstd2525/icons/war/sfgpuuacr------.svg | 28 +- milstd2525/icons/war/sfgpuuacrs-----.svg | 28 +- milstd2525/icons/war/sfgpuuacrw-----.svg | 28 +- milstd2525/icons/war/sfgpuuacs------.svg | 28 +- milstd2525/icons/war/sfgpuuacsa-----.svg | 28 +- milstd2525/icons/war/sfgpuuacsm-----.svg | 28 +- milstd2525/icons/war/sfgpuuad-------.svg | 28 +- milstd2525/icons/war/sfgpuuan-------.svg | 28 +- milstd2525/icons/war/sfgpuue--------.svg | 28 +- milstd2525/icons/war/sfgpuui--------.svg | 28 +- milstd2525/icons/war/sfgpuul--------.svg | 28 +- milstd2525/icons/war/sfgpuulc-------.svg | 28 +- milstd2525/icons/war/sfgpuuld-------.svg | 28 +- milstd2525/icons/war/sfgpuulf-------.svg | 28 +- milstd2525/icons/war/sfgpuulm-------.svg | 28 +- milstd2525/icons/war/sfgpuuls-------.svg | 28 +- milstd2525/icons/war/sfgpuum--------.svg | 28 +- milstd2525/icons/war/sfgpuuma-------.svg | 28 +- milstd2525/icons/war/sfgpuumc-------.svg | 28 +- milstd2525/icons/war/sfgpuumj-------.svg | 28 +- milstd2525/icons/war/sfgpuummo------.svg | 28 +- milstd2525/icons/war/sfgpuumo-------.svg | 28 +- milstd2525/icons/war/sfgpuumq-------.svg | 28 +- milstd2525/icons/war/sfgpuumr-------.svg | 28 +- milstd2525/icons/war/sfgpuumrg------.svg | 28 +- milstd2525/icons/war/sfgpuumrs------.svg | 28 +- milstd2525/icons/war/sfgpuumrss-----.svg | 28 +- milstd2525/icons/war/sfgpuumrx------.svg | 28 +- milstd2525/icons/war/sfgpuums-------.svg | 28 +- milstd2525/icons/war/sfgpuumse------.svg | 28 +- milstd2525/icons/war/sfgpuumsea-----.svg | 28 +- milstd2525/icons/war/sfgpuumsec-----.svg | 28 +- milstd2525/icons/war/sfgpuumsed-----.svg | 28 +- milstd2525/icons/war/sfgpuumsei-----.svg | 28 +- milstd2525/icons/war/sfgpuumsej-----.svg | 28 +- milstd2525/icons/war/sfgpuumset-----.svg | 28 +- milstd2525/icons/war/sfgpuumt-------.svg | 28 +- milstd2525/icons/war/sfgpuup--------.svg | 28 +- milstd2525/icons/war/sfgpuus--------.svg | 28 +- milstd2525/icons/war/sfgpuusa-------.svg | 28 +- milstd2525/icons/war/sfgpuusc-------.svg | 28 +- milstd2525/icons/war/sfgpuuscl------.svg | 28 +- milstd2525/icons/war/sfgpuusf-------.svg | 28 +- milstd2525/icons/war/sfgpuusm-------.svg | 28 +- milstd2525/icons/war/sfgpuusml------.svg | 28 +- milstd2525/icons/war/sfgpuusmn------.svg | 28 +- milstd2525/icons/war/sfgpuusms------.svg | 28 +- milstd2525/icons/war/sfgpuuso-------.svg | 28 +- milstd2525/icons/war/sfgpuusr-------.svg | 28 +- milstd2525/icons/war/sfgpuusrs------.svg | 28 +- milstd2525/icons/war/sfgpuusrt------.svg | 28 +- milstd2525/icons/war/sfgpuusrw------.svg | 28 +- milstd2525/icons/war/sfgpuuss-------.svg | 28 +- milstd2525/icons/war/sfgpuusw-------.svg | 28 +- milstd2525/icons/war/sfgpuusx-------.svg | 28 +- milstd2525/icons/war/sfpa-----------.svg | 28 +- milstd2525/icons/war/sfpal----------.svg | 28 +- milstd2525/icons/war/sfpas----------.svg | 28 +- milstd2525/icons/war/sfpat----------.svg | 28 +- milstd2525/icons/war/sfpav----------.svg | 28 +- milstd2525/icons/war/sfpp-----------.svg | 28 +- milstd2525/icons/war/sfppl----------.svg | 28 +- milstd2525/icons/war/sfpps----------.svg | 28 +- milstd2525/icons/war/sfppt----------.svg | 28 +- milstd2525/icons/war/sfppv----------.svg | 28 +- milstd2525/icons/war/sfsa-----------.svg | 28 +- milstd2525/icons/war/sfsac----------.svg | 28 +- milstd2525/icons/war/sfsaca---------.svg | 28 +- milstd2525/icons/war/sfsacala-------.svg | 28 +- milstd2525/icons/war/sfsacalc-------.svg | 28 +- milstd2525/icons/war/sfsacals-------.svg | 28 +- milstd2525/icons/war/sfsacalsm------.svg | 28 +- milstd2525/icons/war/sfsacalst------.svg | 28 +- milstd2525/icons/war/sfsacd---------.svg | 28 +- milstd2525/icons/war/sfsach---------.svg | 28 +- milstd2525/icons/war/sfsacl---------.svg | 28 +- milstd2525/icons/war/sfsaclbb-------.svg | 28 +- milstd2525/icons/war/sfsaclcc-------.svg | 28 +- milstd2525/icons/war/sfsaclcv-------.svg | 28 +- milstd2525/icons/war/sfsacldd-------.svg | 28 +- milstd2525/icons/war/sfsaclff-------.svg | 28 +- milstd2525/icons/war/sfsaclll-------.svg | 28 +- milstd2525/icons/war/sfsaclllas-----.svg | 28 +- milstd2525/icons/war/sfsaclllmi-----.svg | 28 +- milstd2525/icons/war/sfsaclllsu-----.svg | 28 +- milstd2525/icons/war/sfsacm---------.svg | 28 +- milstd2525/icons/war/sfsacmma-------.svg | 28 +- milstd2525/icons/war/sfsacmmh-------.svg | 28 +- milstd2525/icons/war/sfsacmml-------.svg | 28 +- milstd2525/icons/war/sfsacmms-------.svg | 28 +- milstd2525/icons/war/sfsacp---------.svg | 28 +- milstd2525/icons/war/sfsacpsb-------.svg | 28 +- milstd2525/icons/war/sfsacpsu-------.svg | 28 +- milstd2525/icons/war/sfsacpsug------.svg | 28 +- milstd2525/icons/war/sfsacpsum------.svg | 28 +- milstd2525/icons/war/sfsacpsut------.svg | 28 +- milstd2525/icons/war/sfsacu---------.svg | 28 +- milstd2525/icons/war/sfsacum--------.svg | 28 +- milstd2525/icons/war/sfsacun--------.svg | 28 +- milstd2525/icons/war/sfsacur--------.svg | 28 +- milstd2525/icons/war/sfsacus--------.svg | 28 +- milstd2525/icons/war/sfsag----------.svg | 28 +- milstd2525/icons/war/sfsagc---------.svg | 28 +- milstd2525/icons/war/sfsagg---------.svg | 28 +- milstd2525/icons/war/sfsagt---------.svg | 28 +- milstd2525/icons/war/sfsagu---------.svg | 28 +- milstd2525/icons/war/sfsan----------.svg | 28 +- milstd2525/icons/war/sfsanf---------.svg | 28 +- milstd2525/icons/war/sfsanh---------.svg | 28 +- milstd2525/icons/war/sfsani---------.svg | 28 +- milstd2525/icons/war/sfsanm---------.svg | 28 +- milstd2525/icons/war/sfsanr---------.svg | 28 +- milstd2525/icons/war/sfsans---------.svg | 28 +- milstd2525/icons/war/sfsao----------.svg | 28 +- milstd2525/icons/war/sfsaxa---------.svg | 28 +- milstd2525/icons/war/sfsaxar--------.svg | 28 +- milstd2525/icons/war/sfsaxas--------.svg | 28 +- milstd2525/icons/war/sfsaxf---------.svg | 28 +- milstd2525/icons/war/sfsaxfdf-------.svg | 28 +- milstd2525/icons/war/sfsaxfdr-------.svg | 28 +- milstd2525/icons/war/sfsaxftr-------.svg | 28 +- milstd2525/icons/war/sfsaxh---------.svg | 28 +- milstd2525/icons/war/sfsaxl---------.svg | 28 +- milstd2525/icons/war/sfsaxm---------.svg | 28 +- milstd2525/icons/war/sfsaxmc--------.svg | 28 +- milstd2525/icons/war/sfsaxmf--------.svg | 28 +- milstd2525/icons/war/sfsaxmh--------.svg | 28 +- milstd2525/icons/war/sfsaxmo--------.svg | 28 +- milstd2525/icons/war/sfsaxmp--------.svg | 28 +- milstd2525/icons/war/sfsaxmr--------.svg | 28 +- milstd2525/icons/war/sfsaxmto-------.svg | 28 +- milstd2525/icons/war/sfsaxmtu-------.svg | 28 +- milstd2525/icons/war/sfsaxp---------.svg | 28 +- milstd2525/icons/war/sfsaxr---------.svg | 28 +- milstd2525/icons/war/sfsp-----------.svg | 28 +- milstd2525/icons/war/sfspc----------.svg | 28 +- milstd2525/icons/war/sfspca---------.svg | 28 +- milstd2525/icons/war/sfspcala-------.svg | 28 +- milstd2525/icons/war/sfspcalc-------.svg | 28 +- milstd2525/icons/war/sfspcals-------.svg | 28 +- milstd2525/icons/war/sfspcalsm------.svg | 28 +- milstd2525/icons/war/sfspcalst------.svg | 28 +- milstd2525/icons/war/sfspcd---------.svg | 28 +- milstd2525/icons/war/sfspch---------.svg | 28 +- milstd2525/icons/war/sfspcl---------.svg | 28 +- milstd2525/icons/war/sfspclbb-------.svg | 28 +- milstd2525/icons/war/sfspclcc-------.svg | 28 +- milstd2525/icons/war/sfspclcv-------.svg | 28 +- milstd2525/icons/war/sfspcldd-------.svg | 28 +- milstd2525/icons/war/sfspclff-------.svg | 28 +- milstd2525/icons/war/sfspclll-------.svg | 28 +- milstd2525/icons/war/sfspclllas-----.svg | 28 +- milstd2525/icons/war/sfspclllmi-----.svg | 28 +- milstd2525/icons/war/sfspclllsu-----.svg | 28 +- milstd2525/icons/war/sfspcm---------.svg | 28 +- milstd2525/icons/war/sfspcmma-------.svg | 28 +- milstd2525/icons/war/sfspcmmh-------.svg | 28 +- milstd2525/icons/war/sfspcmml-------.svg | 28 +- milstd2525/icons/war/sfspcmms-------.svg | 28 +- milstd2525/icons/war/sfspcp---------.svg | 28 +- milstd2525/icons/war/sfspcpsb-------.svg | 28 +- milstd2525/icons/war/sfspcpsu-------.svg | 28 +- milstd2525/icons/war/sfspcpsug------.svg | 28 +- milstd2525/icons/war/sfspcpsum------.svg | 28 +- milstd2525/icons/war/sfspcpsut------.svg | 28 +- milstd2525/icons/war/sfspcu---------.svg | 28 +- milstd2525/icons/war/sfspcum--------.svg | 28 +- milstd2525/icons/war/sfspcun--------.svg | 28 +- milstd2525/icons/war/sfspcur--------.svg | 28 +- milstd2525/icons/war/sfspcus--------.svg | 28 +- milstd2525/icons/war/sfspg----------.svg | 28 +- milstd2525/icons/war/sfspgc---------.svg | 28 +- milstd2525/icons/war/sfspgg---------.svg | 28 +- milstd2525/icons/war/sfspgt---------.svg | 28 +- milstd2525/icons/war/sfspgu---------.svg | 28 +- milstd2525/icons/war/sfspn----------.svg | 28 +- milstd2525/icons/war/sfspnf---------.svg | 28 +- milstd2525/icons/war/sfspnh---------.svg | 28 +- milstd2525/icons/war/sfspni---------.svg | 28 +- milstd2525/icons/war/sfspnm---------.svg | 28 +- milstd2525/icons/war/sfspnr---------.svg | 28 +- milstd2525/icons/war/sfspns---------.svg | 28 +- milstd2525/icons/war/sfspo----------.svg | 28 +- milstd2525/icons/war/sfspxa---------.svg | 28 +- milstd2525/icons/war/sfspxar--------.svg | 28 +- milstd2525/icons/war/sfspxas--------.svg | 28 +- milstd2525/icons/war/sfspxf---------.svg | 28 +- milstd2525/icons/war/sfspxfdf-------.svg | 28 +- milstd2525/icons/war/sfspxfdr-------.svg | 28 +- milstd2525/icons/war/sfspxftr-------.svg | 28 +- milstd2525/icons/war/sfspxh---------.svg | 28 +- milstd2525/icons/war/sfspxl---------.svg | 28 +- milstd2525/icons/war/sfspxm---------.svg | 28 +- milstd2525/icons/war/sfspxmc--------.svg | 28 +- milstd2525/icons/war/sfspxmf--------.svg | 28 +- milstd2525/icons/war/sfspxmh--------.svg | 28 +- milstd2525/icons/war/sfspxmo--------.svg | 28 +- milstd2525/icons/war/sfspxmp--------.svg | 28 +- milstd2525/icons/war/sfspxmr--------.svg | 28 +- milstd2525/icons/war/sfspxmto-------.svg | 28 +- milstd2525/icons/war/sfspxmtu-------.svg | 28 +- milstd2525/icons/war/sfspxp---------.svg | 28 +- milstd2525/icons/war/sfspxr---------.svg | 28 +- milstd2525/icons/war/sfua-----------.svg | 28 +- milstd2525/icons/war/sfuae----------.svg | 28 +- milstd2525/icons/war/sfuand---------.svg | 28 +- milstd2525/icons/war/sfuas----------.svg | 28 +- milstd2525/icons/war/sfuas1---------.svg | 28 +- milstd2525/icons/war/sfuas2---------.svg | 28 +- milstd2525/icons/war/sfuas3---------.svg | 28 +- milstd2525/icons/war/sfuas4---------.svg | 28 +- milstd2525/icons/war/sfuasb---------.svg | 28 +- milstd2525/icons/war/sfuasc---------.svg | 28 +- milstd2525/icons/war/sfuasca--------.svg | 28 +- milstd2525/icons/war/sfuascb--------.svg | 28 +- milstd2525/icons/war/sfuascf--------.svg | 28 +- milstd2525/icons/war/sfuascg--------.svg | 28 +- milstd2525/icons/war/sfuascm--------.svg | 28 +- milstd2525/icons/war/sfuasf---------.svg | 28 +- milstd2525/icons/war/sfuask---------.svg | 28 +- milstd2525/icons/war/sfuasl---------.svg | 28 +- milstd2525/icons/war/sfuasn---------.svg | 28 +- milstd2525/icons/war/sfuasna--------.svg | 28 +- milstd2525/icons/war/sfuasnb--------.svg | 28 +- milstd2525/icons/war/sfuasnf--------.svg | 28 +- milstd2525/icons/war/sfuasng--------.svg | 28 +- milstd2525/icons/war/sfuasnm--------.svg | 28 +- milstd2525/icons/war/sfuaso---------.svg | 28 +- milstd2525/icons/war/sfuasof--------.svg | 28 +- milstd2525/icons/war/sfuasr---------.svg | 28 +- milstd2525/icons/war/sfuasu---------.svg | 28 +- milstd2525/icons/war/sfuasum--------.svg | 28 +- milstd2525/icons/war/sfuasun--------.svg | 28 +- milstd2525/icons/war/sfuasus--------.svg | 28 +- milstd2525/icons/war/sfuasx---------.svg | 28 +- milstd2525/icons/war/sfuav----------.svg | 28 +- milstd2525/icons/war/sfuaw----------.svg | 28 +- milstd2525/icons/war/sfuawd---------.svg | 28 +- milstd2525/icons/war/sfuawdm--------.svg | 28 +- milstd2525/icons/war/sfuawdmg-------.svg | 28 +- milstd2525/icons/war/sfuawdmm-------.svg | 28 +- milstd2525/icons/war/sfuawm---------.svg | 28 +- milstd2525/icons/war/sfuawma--------.svg | 28 +- milstd2525/icons/war/sfuawmb--------.svg | 28 +- milstd2525/icons/war/sfuawmbd-------.svg | 28 +- milstd2525/icons/war/sfuawmc--------.svg | 28 +- milstd2525/icons/war/sfuawmd--------.svg | 28 +- milstd2525/icons/war/sfuawme--------.svg | 28 +- milstd2525/icons/war/sfuawmf--------.svg | 28 +- milstd2525/icons/war/sfuawmfc-------.svg | 28 +- milstd2525/icons/war/sfuawmfd-------.svg | 28 +- milstd2525/icons/war/sfuawmfe-------.svg | 28 +- milstd2525/icons/war/sfuawmfo-------.svg | 28 +- milstd2525/icons/war/sfuawmfr-------.svg | 28 +- milstd2525/icons/war/sfuawmfx-------.svg | 28 +- milstd2525/icons/war/sfuawmg--------.svg | 28 +- milstd2525/icons/war/sfuawmgc-------.svg | 28 +- milstd2525/icons/war/sfuawmgd-------.svg | 28 +- milstd2525/icons/war/sfuawmge-------.svg | 28 +- milstd2525/icons/war/sfuawmgo-------.svg | 28 +- milstd2525/icons/war/sfuawmgr-------.svg | 28 +- milstd2525/icons/war/sfuawmgx-------.svg | 28 +- milstd2525/icons/war/sfuawmm--------.svg | 28 +- milstd2525/icons/war/sfuawmmc-------.svg | 28 +- milstd2525/icons/war/sfuawmmd-------.svg | 28 +- milstd2525/icons/war/sfuawmme-------.svg | 28 +- milstd2525/icons/war/sfuawmmo-------.svg | 28 +- milstd2525/icons/war/sfuawmmr-------.svg | 28 +- milstd2525/icons/war/sfuawmmx-------.svg | 28 +- milstd2525/icons/war/sfuawmn--------.svg | 28 +- milstd2525/icons/war/sfuawmo--------.svg | 28 +- milstd2525/icons/war/sfuawmod-------.svg | 28 +- milstd2525/icons/war/sfuawmr--------.svg | 28 +- milstd2525/icons/war/sfuawms--------.svg | 28 +- milstd2525/icons/war/sfuawmsd-------.svg | 28 +- milstd2525/icons/war/sfuawmsx-------.svg | 28 +- milstd2525/icons/war/sfuawmx--------.svg | 28 +- milstd2525/icons/war/sfuawt---------.svg | 28 +- milstd2525/icons/war/sfuax----------.svg | 28 +- milstd2525/icons/war/sfup-----------.svg | 28 +- milstd2525/icons/war/sfupe----------.svg | 28 +- milstd2525/icons/war/sfupnd---------.svg | 28 +- milstd2525/icons/war/sfups----------.svg | 28 +- milstd2525/icons/war/sfups1---------.svg | 28 +- milstd2525/icons/war/sfups2---------.svg | 28 +- milstd2525/icons/war/sfups3---------.svg | 28 +- milstd2525/icons/war/sfups4---------.svg | 28 +- milstd2525/icons/war/sfupsb---------.svg | 28 +- milstd2525/icons/war/sfupsc---------.svg | 28 +- milstd2525/icons/war/sfupsca--------.svg | 28 +- milstd2525/icons/war/sfupscb--------.svg | 28 +- milstd2525/icons/war/sfupscf--------.svg | 28 +- milstd2525/icons/war/sfupscg--------.svg | 28 +- milstd2525/icons/war/sfupscm--------.svg | 28 +- milstd2525/icons/war/sfupsf---------.svg | 28 +- milstd2525/icons/war/sfupsk---------.svg | 28 +- milstd2525/icons/war/sfupsl---------.svg | 28 +- milstd2525/icons/war/sfupsn---------.svg | 28 +- milstd2525/icons/war/sfupsna--------.svg | 28 +- milstd2525/icons/war/sfupsnb--------.svg | 28 +- milstd2525/icons/war/sfupsnf--------.svg | 28 +- milstd2525/icons/war/sfupsng--------.svg | 28 +- milstd2525/icons/war/sfupsnm--------.svg | 28 +- milstd2525/icons/war/sfupso---------.svg | 28 +- milstd2525/icons/war/sfupsof--------.svg | 28 +- milstd2525/icons/war/sfupsr---------.svg | 28 +- milstd2525/icons/war/sfupsu---------.svg | 28 +- milstd2525/icons/war/sfupsum--------.svg | 28 +- milstd2525/icons/war/sfupsun--------.svg | 28 +- milstd2525/icons/war/sfupsus--------.svg | 28 +- milstd2525/icons/war/sfupsx---------.svg | 28 +- milstd2525/icons/war/sfupv----------.svg | 28 +- milstd2525/icons/war/sfupw----------.svg | 28 +- milstd2525/icons/war/sfupwd---------.svg | 28 +- milstd2525/icons/war/sfupwdm--------.svg | 28 +- milstd2525/icons/war/sfupwdmg-------.svg | 28 +- milstd2525/icons/war/sfupwdmm-------.svg | 28 +- milstd2525/icons/war/sfupwm---------.svg | 28 +- milstd2525/icons/war/sfupwma--------.svg | 28 +- milstd2525/icons/war/sfupwmb--------.svg | 28 +- milstd2525/icons/war/sfupwmbd-------.svg | 28 +- milstd2525/icons/war/sfupwmc--------.svg | 28 +- milstd2525/icons/war/sfupwmd--------.svg | 28 +- milstd2525/icons/war/sfupwme--------.svg | 28 +- milstd2525/icons/war/sfupwmf--------.svg | 28 +- milstd2525/icons/war/sfupwmfc-------.svg | 28 +- milstd2525/icons/war/sfupwmfd-------.svg | 28 +- milstd2525/icons/war/sfupwmfe-------.svg | 28 +- milstd2525/icons/war/sfupwmfo-------.svg | 28 +- milstd2525/icons/war/sfupwmfr-------.svg | 28 +- milstd2525/icons/war/sfupwmfx-------.svg | 28 +- milstd2525/icons/war/sfupwmg--------.svg | 28 +- milstd2525/icons/war/sfupwmgc-------.svg | 28 +- milstd2525/icons/war/sfupwmgd-------.svg | 28 +- milstd2525/icons/war/sfupwmge-------.svg | 28 +- milstd2525/icons/war/sfupwmgo-------.svg | 28 +- milstd2525/icons/war/sfupwmgr-------.svg | 28 +- milstd2525/icons/war/sfupwmgx-------.svg | 28 +- milstd2525/icons/war/sfupwmm--------.svg | 28 +- milstd2525/icons/war/sfupwmmc-------.svg | 28 +- milstd2525/icons/war/sfupwmmd-------.svg | 28 +- milstd2525/icons/war/sfupwmme-------.svg | 28 +- milstd2525/icons/war/sfupwmmo-------.svg | 28 +- milstd2525/icons/war/sfupwmmr-------.svg | 28 +- milstd2525/icons/war/sfupwmmx-------.svg | 28 +- milstd2525/icons/war/sfupwmn--------.svg | 28 +- milstd2525/icons/war/sfupwmo--------.svg | 28 +- milstd2525/icons/war/sfupwmod-------.svg | 28 +- milstd2525/icons/war/sfupwmr--------.svg | 28 +- milstd2525/icons/war/sfupwms--------.svg | 28 +- milstd2525/icons/war/sfupwmsd-------.svg | 28 +- milstd2525/icons/war/sfupwmsx-------.svg | 28 +- milstd2525/icons/war/sfupwmx--------.svg | 28 +- milstd2525/icons/war/sfupwt---------.svg | 28 +- milstd2525/icons/war/sfupx----------.svg | 28 +- milstd2525/icons/war/shaa-----------.svg | 28 +- milstd2525/icons/war/shaac----------.svg | 28 +- milstd2525/icons/war/shaacf---------.svg | 28 +- milstd2525/icons/war/shaach---------.svg | 28 +- milstd2525/icons/war/shaacl---------.svg | 28 +- milstd2525/icons/war/shaam----------.svg | 28 +- milstd2525/icons/war/shaame---------.svg | 28 +- milstd2525/icons/war/shaamf---------.svg | 28 +- milstd2525/icons/war/shaamfa--------.svg | 28 +- milstd2525/icons/war/shaamfb--------.svg | 28 +- milstd2525/icons/war/shaamfc--------.svg | 28 +- milstd2525/icons/war/shaamfch-------.svg | 28 +- milstd2525/icons/war/shaamfcl-------.svg | 28 +- milstd2525/icons/war/shaamfcm-------.svg | 28 +- milstd2525/icons/war/shaamfd--------.svg | 28 +- milstd2525/icons/war/shaamff--------.svg | 28 +- milstd2525/icons/war/shaamffi-------.svg | 28 +- milstd2525/icons/war/shaamfh--------.svg | 28 +- milstd2525/icons/war/shaamfj--------.svg | 28 +- milstd2525/icons/war/shaamfk--------.svg | 28 +- milstd2525/icons/war/shaamfkb-------.svg | 28 +- milstd2525/icons/war/shaamfkd-------.svg | 28 +- milstd2525/icons/war/shaamfl--------.svg | 28 +- milstd2525/icons/war/shaamfm--------.svg | 28 +- milstd2525/icons/war/shaamfo--------.svg | 28 +- milstd2525/icons/war/shaamfp--------.svg | 28 +- milstd2525/icons/war/shaamfpm-------.svg | 28 +- milstd2525/icons/war/shaamfpn-------.svg | 28 +- milstd2525/icons/war/shaamfq--------.svg | 28 +- milstd2525/icons/war/shaamfqa-------.svg | 28 +- milstd2525/icons/war/shaamfqb-------.svg | 28 +- milstd2525/icons/war/shaamfqc-------.svg | 28 +- milstd2525/icons/war/shaamfqd-------.svg | 28 +- milstd2525/icons/war/shaamfqf-------.svg | 28 +- milstd2525/icons/war/shaamfqh-------.svg | 28 +- milstd2525/icons/war/shaamfqi-------.svg | 28 +- milstd2525/icons/war/shaamfqj-------.svg | 28 +- milstd2525/icons/war/shaamfqk-------.svg | 28 +- milstd2525/icons/war/shaamfql-------.svg | 28 +- milstd2525/icons/war/shaamfqm-------.svg | 28 +- milstd2525/icons/war/shaamfqn-------.svg | 28 +- milstd2525/icons/war/shaamfqo-------.svg | 28 +- milstd2525/icons/war/shaamfqp-------.svg | 28 +- milstd2525/icons/war/shaamfqr-------.svg | 28 +- milstd2525/icons/war/shaamfqrw------.svg | 28 +- milstd2525/icons/war/shaamfqrx------.svg | 28 +- milstd2525/icons/war/shaamfqrz------.svg | 28 +- milstd2525/icons/war/shaamfqs-------.svg | 28 +- milstd2525/icons/war/shaamfqt-------.svg | 28 +- milstd2525/icons/war/shaamfqu-------.svg | 28 +- milstd2525/icons/war/shaamfqy-------.svg | 28 +- milstd2525/icons/war/shaamfr--------.svg | 28 +- milstd2525/icons/war/shaamfrw-------.svg | 28 +- milstd2525/icons/war/shaamfrx-------.svg | 28 +- milstd2525/icons/war/shaamfrz-------.svg | 28 +- milstd2525/icons/war/shaamfs--------.svg | 28 +- milstd2525/icons/war/shaamft--------.svg | 28 +- milstd2525/icons/war/shaamfu--------.svg | 28 +- milstd2525/icons/war/shaamfuh-------.svg | 28 +- milstd2525/icons/war/shaamful-------.svg | 28 +- milstd2525/icons/war/shaamfum-------.svg | 28 +- milstd2525/icons/war/shaamfy--------.svg | 28 +- milstd2525/icons/war/shaamh---------.svg | 28 +- milstd2525/icons/war/shaamha--------.svg | 28 +- milstd2525/icons/war/shaamhc--------.svg | 28 +- milstd2525/icons/war/shaamhch-------.svg | 28 +- milstd2525/icons/war/shaamhcl-------.svg | 28 +- milstd2525/icons/war/shaamhcm-------.svg | 28 +- milstd2525/icons/war/shaamhd--------.svg | 28 +- milstd2525/icons/war/shaamhh--------.svg | 28 +- milstd2525/icons/war/shaamhi--------.svg | 28 +- milstd2525/icons/war/shaamhj--------.svg | 28 +- milstd2525/icons/war/shaamhk--------.svg | 28 +- milstd2525/icons/war/shaamhm--------.svg | 28 +- milstd2525/icons/war/shaamho--------.svg | 28 +- milstd2525/icons/war/shaamhq--------.svg | 28 +- milstd2525/icons/war/shaamhr--------.svg | 28 +- milstd2525/icons/war/shaamhs--------.svg | 28 +- milstd2525/icons/war/shaamht--------.svg | 28 +- milstd2525/icons/war/shaamhu--------.svg | 28 +- milstd2525/icons/war/shaamhuh-------.svg | 28 +- milstd2525/icons/war/shaamhul-------.svg | 28 +- milstd2525/icons/war/shaamhum-------.svg | 28 +- milstd2525/icons/war/shaaml---------.svg | 28 +- milstd2525/icons/war/shaamv---------.svg | 28 +- milstd2525/icons/war/shaaw----------.svg | 28 +- milstd2525/icons/war/shaawb---------.svg | 28 +- milstd2525/icons/war/shaawd---------.svg | 28 +- milstd2525/icons/war/shaawm---------.svg | 28 +- milstd2525/icons/war/shaawma--------.svg | 28 +- milstd2525/icons/war/shaawmaa-------.svg | 28 +- milstd2525/icons/war/shaawmap-------.svg | 28 +- milstd2525/icons/war/shaawmas-------.svg | 28 +- milstd2525/icons/war/shaawmb--------.svg | 28 +- milstd2525/icons/war/shaawmcm-------.svg | 28 +- milstd2525/icons/war/shaawms--------.svg | 28 +- milstd2525/icons/war/shaawmsa-------.svg | 28 +- milstd2525/icons/war/shaawmsb-------.svg | 28 +- milstd2525/icons/war/shaawmss-------.svg | 28 +- milstd2525/icons/war/shaawmsu-------.svg | 28 +- milstd2525/icons/war/shaawmu--------.svg | 28 +- milstd2525/icons/war/shap-----------.svg | 28 +- milstd2525/icons/war/shapc----------.svg | 28 +- milstd2525/icons/war/shapcf---------.svg | 28 +- milstd2525/icons/war/shapch---------.svg | 28 +- milstd2525/icons/war/shapcl---------.svg | 28 +- milstd2525/icons/war/shapm----------.svg | 28 +- milstd2525/icons/war/shapme---------.svg | 28 +- milstd2525/icons/war/shapmf---------.svg | 28 +- milstd2525/icons/war/shapmfa--------.svg | 28 +- milstd2525/icons/war/shapmfb--------.svg | 28 +- milstd2525/icons/war/shapmfc--------.svg | 28 +- milstd2525/icons/war/shapmfch-------.svg | 28 +- milstd2525/icons/war/shapmfcl-------.svg | 28 +- milstd2525/icons/war/shapmfcm-------.svg | 28 +- milstd2525/icons/war/shapmfd--------.svg | 28 +- milstd2525/icons/war/shapmff--------.svg | 28 +- milstd2525/icons/war/shapmffi-------.svg | 28 +- milstd2525/icons/war/shapmfh--------.svg | 28 +- milstd2525/icons/war/shapmfj--------.svg | 28 +- milstd2525/icons/war/shapmfk--------.svg | 28 +- milstd2525/icons/war/shapmfkb-------.svg | 28 +- milstd2525/icons/war/shapmfkd-------.svg | 28 +- milstd2525/icons/war/shapmfl--------.svg | 28 +- milstd2525/icons/war/shapmfm--------.svg | 28 +- milstd2525/icons/war/shapmfo--------.svg | 28 +- milstd2525/icons/war/shapmfp--------.svg | 28 +- milstd2525/icons/war/shapmfpm-------.svg | 28 +- milstd2525/icons/war/shapmfpn-------.svg | 28 +- milstd2525/icons/war/shapmfq--------.svg | 28 +- milstd2525/icons/war/shapmfqa-------.svg | 28 +- milstd2525/icons/war/shapmfqb-------.svg | 28 +- milstd2525/icons/war/shapmfqc-------.svg | 28 +- milstd2525/icons/war/shapmfqd-------.svg | 28 +- milstd2525/icons/war/shapmfqf-------.svg | 28 +- milstd2525/icons/war/shapmfqh-------.svg | 28 +- milstd2525/icons/war/shapmfqi-------.svg | 28 +- milstd2525/icons/war/shapmfqj-------.svg | 28 +- milstd2525/icons/war/shapmfqk-------.svg | 28 +- milstd2525/icons/war/shapmfql-------.svg | 28 +- milstd2525/icons/war/shapmfqm-------.svg | 28 +- milstd2525/icons/war/shapmfqn-------.svg | 28 +- milstd2525/icons/war/shapmfqo-------.svg | 28 +- milstd2525/icons/war/shapmfqp-------.svg | 28 +- milstd2525/icons/war/shapmfqr-------.svg | 28 +- milstd2525/icons/war/shapmfqrw------.svg | 28 +- milstd2525/icons/war/shapmfqrx------.svg | 28 +- milstd2525/icons/war/shapmfqrz------.svg | 28 +- milstd2525/icons/war/shapmfqs-------.svg | 28 +- milstd2525/icons/war/shapmfqt-------.svg | 28 +- milstd2525/icons/war/shapmfqu-------.svg | 28 +- milstd2525/icons/war/shapmfqy-------.svg | 28 +- milstd2525/icons/war/shapmfr--------.svg | 28 +- milstd2525/icons/war/shapmfrw-------.svg | 28 +- milstd2525/icons/war/shapmfrx-------.svg | 28 +- milstd2525/icons/war/shapmfrz-------.svg | 28 +- milstd2525/icons/war/shapmfs--------.svg | 28 +- milstd2525/icons/war/shapmft--------.svg | 28 +- milstd2525/icons/war/shapmfu--------.svg | 28 +- milstd2525/icons/war/shapmfuh-------.svg | 28 +- milstd2525/icons/war/shapmful-------.svg | 28 +- milstd2525/icons/war/shapmfum-------.svg | 28 +- milstd2525/icons/war/shapmfy--------.svg | 28 +- milstd2525/icons/war/shapmh---------.svg | 28 +- milstd2525/icons/war/shapmha--------.svg | 28 +- milstd2525/icons/war/shapmhc--------.svg | 28 +- milstd2525/icons/war/shapmhch-------.svg | 28 +- milstd2525/icons/war/shapmhcl-------.svg | 28 +- milstd2525/icons/war/shapmhcm-------.svg | 28 +- milstd2525/icons/war/shapmhd--------.svg | 28 +- milstd2525/icons/war/shapmhh--------.svg | 28 +- milstd2525/icons/war/shapmhi--------.svg | 28 +- milstd2525/icons/war/shapmhj--------.svg | 28 +- milstd2525/icons/war/shapmhk--------.svg | 28 +- milstd2525/icons/war/shapmhm--------.svg | 28 +- milstd2525/icons/war/shapmho--------.svg | 28 +- milstd2525/icons/war/shapmhq--------.svg | 28 +- milstd2525/icons/war/shapmhr--------.svg | 28 +- milstd2525/icons/war/shapmhs--------.svg | 28 +- milstd2525/icons/war/shapmht--------.svg | 28 +- milstd2525/icons/war/shapmhu--------.svg | 28 +- milstd2525/icons/war/shapmhuh-------.svg | 28 +- milstd2525/icons/war/shapmhul-------.svg | 28 +- milstd2525/icons/war/shapmhum-------.svg | 28 +- milstd2525/icons/war/shapml---------.svg | 28 +- milstd2525/icons/war/shapmv---------.svg | 28 +- milstd2525/icons/war/shapw----------.svg | 28 +- milstd2525/icons/war/shapwb---------.svg | 28 +- milstd2525/icons/war/shapwd---------.svg | 28 +- milstd2525/icons/war/shapwm---------.svg | 28 +- milstd2525/icons/war/shapwma--------.svg | 28 +- milstd2525/icons/war/shapwmaa-------.svg | 28 +- milstd2525/icons/war/shapwmap-------.svg | 28 +- milstd2525/icons/war/shapwmas-------.svg | 28 +- milstd2525/icons/war/shapwmb--------.svg | 28 +- milstd2525/icons/war/shapwmcm-------.svg | 28 +- milstd2525/icons/war/shapwms--------.svg | 28 +- milstd2525/icons/war/shapwmsa-------.svg | 28 +- milstd2525/icons/war/shapwmsb-------.svg | 28 +- milstd2525/icons/war/shapwmss-------.svg | 28 +- milstd2525/icons/war/shapwmsu-------.svg | 28 +- milstd2525/icons/war/shapwmu--------.svg | 28 +- milstd2525/icons/war/shfa-----------.svg | 28 +- milstd2525/icons/war/shfaa----------.svg | 28 +- milstd2525/icons/war/shfaaf---------.svg | 28 +- milstd2525/icons/war/shfaafa--------.svg | 28 +- milstd2525/icons/war/shfaafk--------.svg | 28 +- milstd2525/icons/war/shfaafu--------.svg | 28 +- milstd2525/icons/war/shfaafuh-------.svg | 28 +- milstd2525/icons/war/shfaaful-------.svg | 28 +- milstd2525/icons/war/shfaafum-------.svg | 28 +- milstd2525/icons/war/shfaah---------.svg | 28 +- milstd2525/icons/war/shfaaha--------.svg | 28 +- milstd2525/icons/war/shfaahh--------.svg | 28 +- milstd2525/icons/war/shfaahu--------.svg | 28 +- milstd2525/icons/war/shfaahuh-------.svg | 28 +- milstd2525/icons/war/shfaahul-------.svg | 28 +- milstd2525/icons/war/shfaahum-------.svg | 28 +- milstd2525/icons/war/shfaav---------.svg | 28 +- milstd2525/icons/war/shfab----------.svg | 28 +- milstd2525/icons/war/shfag----------.svg | 28 +- milstd2525/icons/war/shfagc---------.svg | 28 +- milstd2525/icons/war/shfagp---------.svg | 28 +- milstd2525/icons/war/shfagpa--------.svg | 28 +- milstd2525/icons/war/shfagr---------.svg | 28 +- milstd2525/icons/war/shfags---------.svg | 28 +- milstd2525/icons/war/shfan----------.svg | 28 +- milstd2525/icons/war/shfanb---------.svg | 28 +- milstd2525/icons/war/shfann---------.svg | 28 +- milstd2525/icons/war/shfans---------.svg | 28 +- milstd2525/icons/war/shfanu---------.svg | 28 +- milstd2525/icons/war/shfp-----------.svg | 28 +- milstd2525/icons/war/shfpa----------.svg | 28 +- milstd2525/icons/war/shfpaf---------.svg | 28 +- milstd2525/icons/war/shfpafa--------.svg | 28 +- milstd2525/icons/war/shfpafk--------.svg | 28 +- milstd2525/icons/war/shfpafu--------.svg | 28 +- milstd2525/icons/war/shfpafuh-------.svg | 28 +- milstd2525/icons/war/shfpaful-------.svg | 28 +- milstd2525/icons/war/shfpafum-------.svg | 28 +- milstd2525/icons/war/shfpah---------.svg | 28 +- milstd2525/icons/war/shfpaha--------.svg | 28 +- milstd2525/icons/war/shfpahh--------.svg | 28 +- milstd2525/icons/war/shfpahu--------.svg | 28 +- milstd2525/icons/war/shfpahuh-------.svg | 28 +- milstd2525/icons/war/shfpahul-------.svg | 28 +- milstd2525/icons/war/shfpahum-------.svg | 28 +- milstd2525/icons/war/shfpav---------.svg | 28 +- milstd2525/icons/war/shfpb----------.svg | 28 +- milstd2525/icons/war/shfpg----------.svg | 28 +- milstd2525/icons/war/shfpgc---------.svg | 28 +- milstd2525/icons/war/shfpgp---------.svg | 28 +- milstd2525/icons/war/shfpgpa--------.svg | 28 +- milstd2525/icons/war/shfpgr---------.svg | 28 +- milstd2525/icons/war/shfpgs---------.svg | 28 +- milstd2525/icons/war/shfpn----------.svg | 28 +- milstd2525/icons/war/shfpnb---------.svg | 28 +- milstd2525/icons/war/shfpnn---------.svg | 28 +- milstd2525/icons/war/shfpns---------.svg | 28 +- milstd2525/icons/war/shfpnu---------.svg | 28 +- milstd2525/icons/war/shga-----------.svg | 28 +- milstd2525/icons/war/shgae----------.svg | 28 +- milstd2525/icons/war/shgaes---------.svg | 28 +- milstd2525/icons/war/shgaese--------.svg | 28 +- milstd2525/icons/war/shgaesr--------.svg | 28 +- milstd2525/icons/war/shgaev---------.svg | 28 +- milstd2525/icons/war/shgaeva--------.svg | 28 +- milstd2525/icons/war/shgaevaa-------.svg | 28 +- milstd2525/icons/war/shgaevaar------.svg | 28 +- milstd2525/icons/war/shgaevac-------.svg | 28 +- milstd2525/icons/war/shgaevai-------.svg | 28 +- milstd2525/icons/war/shgaeval-------.svg | 28 +- milstd2525/icons/war/shgaevas-------.svg | 28 +- milstd2525/icons/war/shgaevat-------.svg | 28 +- milstd2525/icons/war/shgaevath------.svg | 28 +- milstd2525/icons/war/shgaevathr-----.svg | 28 +- milstd2525/icons/war/shgaevatl------.svg | 28 +- milstd2525/icons/war/shgaevatlr-----.svg | 28 +- milstd2525/icons/war/shgaevatm------.svg | 28 +- milstd2525/icons/war/shgaevatmr-----.svg | 28 +- milstd2525/icons/war/shgaevc--------.svg | 28 +- milstd2525/icons/war/shgaevca-------.svg | 28 +- milstd2525/icons/war/shgaevcah------.svg | 28 +- milstd2525/icons/war/shgaevcal------.svg | 28 +- milstd2525/icons/war/shgaevcam------.svg | 28 +- milstd2525/icons/war/shgaevcf-------.svg | 28 +- milstd2525/icons/war/shgaevcfh------.svg | 28 +- milstd2525/icons/war/shgaevcfl------.svg | 28 +- milstd2525/icons/war/shgaevcfm------.svg | 28 +- milstd2525/icons/war/shgaevcj-------.svg | 28 +- milstd2525/icons/war/shgaevcjh------.svg | 28 +- milstd2525/icons/war/shgaevcjl------.svg | 28 +- milstd2525/icons/war/shgaevcjm------.svg | 28 +- milstd2525/icons/war/shgaevcm-------.svg | 28 +- milstd2525/icons/war/shgaevcmh------.svg | 28 +- milstd2525/icons/war/shgaevcml------.svg | 28 +- milstd2525/icons/war/shgaevcmm------.svg | 28 +- milstd2525/icons/war/shgaevco-------.svg | 28 +- milstd2525/icons/war/shgaevcoh------.svg | 28 +- milstd2525/icons/war/shgaevcol------.svg | 28 +- milstd2525/icons/war/shgaevcom------.svg | 28 +- milstd2525/icons/war/shgaevct-------.svg | 28 +- milstd2525/icons/war/shgaevcth------.svg | 28 +- milstd2525/icons/war/shgaevctl------.svg | 28 +- milstd2525/icons/war/shgaevctm------.svg | 28 +- milstd2525/icons/war/shgaevcu-------.svg | 28 +- milstd2525/icons/war/shgaevcuh------.svg | 28 +- milstd2525/icons/war/shgaevcul------.svg | 28 +- milstd2525/icons/war/shgaevcum------.svg | 28 +- milstd2525/icons/war/shgaeve--------.svg | 28 +- milstd2525/icons/war/shgaevea-------.svg | 28 +- milstd2525/icons/war/shgaeveaa------.svg | 28 +- milstd2525/icons/war/shgaeveat------.svg | 28 +- milstd2525/icons/war/shgaeveb-------.svg | 28 +- milstd2525/icons/war/shgaevec-------.svg | 28 +- milstd2525/icons/war/shgaeved-------.svg | 28 +- milstd2525/icons/war/shgaeveda------.svg | 28 +- milstd2525/icons/war/shgaevee-------.svg | 28 +- milstd2525/icons/war/shgaevef-------.svg | 28 +- milstd2525/icons/war/shgaeveh-------.svg | 28 +- milstd2525/icons/war/shgaevem-------.svg | 28 +- milstd2525/icons/war/shgaeveml------.svg | 28 +- milstd2525/icons/war/shgaevemv------.svg | 28 +- milstd2525/icons/war/shgaever-------.svg | 28 +- milstd2525/icons/war/shgaeves-------.svg | 28 +- milstd2525/icons/war/shgaevm--------.svg | 28 +- milstd2525/icons/war/shgaevs--------.svg | 28 +- milstd2525/icons/war/shgaevsc-------.svg | 28 +- milstd2525/icons/war/shgaevsp-------.svg | 28 +- milstd2525/icons/war/shgaevsr-------.svg | 28 +- milstd2525/icons/war/shgaevst-------.svg | 28 +- milstd2525/icons/war/shgaevsw-------.svg | 28 +- milstd2525/icons/war/shgaevt--------.svg | 28 +- milstd2525/icons/war/shgaevu--------.svg | 28 +- milstd2525/icons/war/shgaevua-------.svg | 28 +- milstd2525/icons/war/shgaevuaa------.svg | 28 +- milstd2525/icons/war/shgaevub-------.svg | 28 +- milstd2525/icons/war/shgaevul-------.svg | 28 +- milstd2525/icons/war/shgaevur-------.svg | 28 +- milstd2525/icons/war/shgaevus-------.svg | 28 +- milstd2525/icons/war/shgaevush------.svg | 28 +- milstd2525/icons/war/shgaevusl------.svg | 28 +- milstd2525/icons/war/shgaevusm------.svg | 28 +- milstd2525/icons/war/shgaevut-------.svg | 28 +- milstd2525/icons/war/shgaevuth------.svg | 28 +- milstd2525/icons/war/shgaevutl------.svg | 28 +- milstd2525/icons/war/shgaevux-------.svg | 28 +- milstd2525/icons/war/shgaewa--------.svg | 28 +- milstd2525/icons/war/shgaewah-------.svg | 28 +- milstd2525/icons/war/shgaewal-------.svg | 28 +- milstd2525/icons/war/shgaewam-------.svg | 28 +- milstd2525/icons/war/shgaewd--------.svg | 28 +- milstd2525/icons/war/shgaewdh-------.svg | 28 +- milstd2525/icons/war/shgaewdhs------.svg | 28 +- milstd2525/icons/war/shgaewdl-------.svg | 28 +- milstd2525/icons/war/shgaewdls------.svg | 28 +- milstd2525/icons/war/shgaewdm-------.svg | 28 +- milstd2525/icons/war/shgaewdms------.svg | 28 +- milstd2525/icons/war/shgaewg--------.svg | 28 +- milstd2525/icons/war/shgaewgh-------.svg | 28 +- milstd2525/icons/war/shgaewgl-------.svg | 28 +- milstd2525/icons/war/shgaewgm-------.svg | 28 +- milstd2525/icons/war/shgaewgr-------.svg | 28 +- milstd2525/icons/war/shgaewh--------.svg | 28 +- milstd2525/icons/war/shgaewhh-------.svg | 28 +- milstd2525/icons/war/shgaewhhs------.svg | 28 +- milstd2525/icons/war/shgaewhl-------.svg | 28 +- milstd2525/icons/war/shgaewhls------.svg | 28 +- milstd2525/icons/war/shgaewhm-------.svg | 28 +- milstd2525/icons/war/shgaewhms------.svg | 28 +- milstd2525/icons/war/shgaewm--------.svg | 28 +- milstd2525/icons/war/shgaewma-------.svg | 28 +- milstd2525/icons/war/shgaewmai------.svg | 28 +- milstd2525/icons/war/shgaewmaie-----.svg | 28 +- milstd2525/icons/war/shgaewmair-----.svg | 28 +- milstd2525/icons/war/shgaewmal------.svg | 28 +- milstd2525/icons/war/shgaewmale-----.svg | 28 +- milstd2525/icons/war/shgaewmalr-----.svg | 28 +- milstd2525/icons/war/shgaewmas------.svg | 28 +- milstd2525/icons/war/shgaewmase-----.svg | 28 +- milstd2525/icons/war/shgaewmasr-----.svg | 28 +- milstd2525/icons/war/shgaewmat------.svg | 28 +- milstd2525/icons/war/shgaewmate-----.svg | 28 +- milstd2525/icons/war/shgaewmatr-----.svg | 28 +- milstd2525/icons/war/shgaewms-------.svg | 28 +- milstd2525/icons/war/shgaewmsi------.svg | 28 +- milstd2525/icons/war/shgaewmsl------.svg | 28 +- milstd2525/icons/war/shgaewmss------.svg | 28 +- milstd2525/icons/war/shgaewmt-------.svg | 28 +- milstd2525/icons/war/shgaewmth------.svg | 28 +- milstd2525/icons/war/shgaewmtl------.svg | 28 +- milstd2525/icons/war/shgaewmtm------.svg | 28 +- milstd2525/icons/war/shgaewo--------.svg | 28 +- milstd2525/icons/war/shgaewoh-------.svg | 28 +- milstd2525/icons/war/shgaewol-------.svg | 28 +- milstd2525/icons/war/shgaewom-------.svg | 28 +- milstd2525/icons/war/shgaewr--------.svg | 28 +- milstd2525/icons/war/shgaewrh-------.svg | 28 +- milstd2525/icons/war/shgaewrl-------.svg | 28 +- milstd2525/icons/war/shgaewrr-------.svg | 28 +- milstd2525/icons/war/shgaews--------.svg | 28 +- milstd2525/icons/war/shgaewsh-------.svg | 28 +- milstd2525/icons/war/shgaewsl-------.svg | 28 +- milstd2525/icons/war/shgaewsm-------.svg | 28 +- milstd2525/icons/war/shgaewt--------.svg | 28 +- milstd2525/icons/war/shgaewth-------.svg | 28 +- milstd2525/icons/war/shgaewtl-------.svg | 28 +- milstd2525/icons/war/shgaewtm-------.svg | 28 +- milstd2525/icons/war/shgaewx--------.svg | 28 +- milstd2525/icons/war/shgaewxh-------.svg | 28 +- milstd2525/icons/war/shgaewxl-------.svg | 28 +- milstd2525/icons/war/shgaewxm-------.svg | 28 +- milstd2525/icons/war/shgaewz--------.svg | 28 +- milstd2525/icons/war/shgaewzh-------.svg | 28 +- milstd2525/icons/war/shgaewzl-------.svg | 28 +- milstd2525/icons/war/shgaewzm-------.svg | 28 +- milstd2525/icons/war/shgaexf--------.svg | 28 +- milstd2525/icons/war/shgaexi--------.svg | 28 +- milstd2525/icons/war/shgaexl--------.svg | 28 +- milstd2525/icons/war/shgaexm--------.svg | 28 +- milstd2525/icons/war/shgaexmc-------.svg | 28 +- milstd2525/icons/war/shgaexml-------.svg | 28 +- milstd2525/icons/war/shgaexn--------.svg | 28 +- milstd2525/icons/war/shgai----------.svg | 28 +- milstd2525/icons/war/shgaib---------.svg | 28 +- milstd2525/icons/war/shgaiba--------.svg | 28 +- milstd2525/icons/war/shgaibn--------.svg | 28 +- milstd2525/icons/war/shgaie---------.svg | 28 +- milstd2525/icons/war/shgaig---------.svg | 28 +- milstd2525/icons/war/shgaima--------.svg | 28 +- milstd2525/icons/war/shgaimc--------.svg | 28 +- milstd2525/icons/war/shgaime--------.svg | 28 +- milstd2525/icons/war/shgaimf--------.svg | 28 +- milstd2525/icons/war/shgaimfa-------.svg | 28 +- milstd2525/icons/war/shgaimfp-------.svg | 28 +- milstd2525/icons/war/shgaimfpw------.svg | 28 +- milstd2525/icons/war/shgaimfs-------.svg | 28 +- milstd2525/icons/war/shgaimg--------.svg | 28 +- milstd2525/icons/war/shgaimm--------.svg | 28 +- milstd2525/icons/war/shgaimn--------.svg | 28 +- milstd2525/icons/war/shgaimnb-------.svg | 28 +- milstd2525/icons/war/shgaims--------.svg | 28 +- milstd2525/icons/war/shgaimv--------.svg | 28 +- milstd2525/icons/war/shgaip---------.svg | 28 +- milstd2525/icons/war/shgaipd--------.svg | 28 +- milstd2525/icons/war/shgair---------.svg | 28 +- milstd2525/icons/war/shgairm--------.svg | 28 +- milstd2525/icons/war/shgairn--------.svg | 28 +- milstd2525/icons/war/shgairnb-------.svg | 28 +- milstd2525/icons/war/shgairnc-------.svg | 28 +- milstd2525/icons/war/shgairnn-------.svg | 28 +- milstd2525/icons/war/shgairp--------.svg | 28 +- milstd2525/icons/war/shgait---------.svg | 28 +- milstd2525/icons/war/shgaiu---------.svg | 28 +- milstd2525/icons/war/shgaiue--------.svg | 28 +- milstd2525/icons/war/shgaiued-------.svg | 28 +- milstd2525/icons/war/shgaiuef-------.svg | 28 +- milstd2525/icons/war/shgaiuen-------.svg | 28 +- milstd2525/icons/war/shgaiup--------.svg | 28 +- milstd2525/icons/war/shgaiur--------.svg | 28 +- milstd2525/icons/war/shgaiut--------.svg | 28 +- milstd2525/icons/war/shgaix---------.svg | 28 +- milstd2525/icons/war/shgaixh--------.svg | 28 +- milstd2525/icons/war/shgau----------.svg | 28 +- milstd2525/icons/war/shgauc---------.svg | 28 +- milstd2525/icons/war/shgauca--------.svg | 28 +- milstd2525/icons/war/shgaucaa-------.svg | 28 +- milstd2525/icons/war/shgaucaaa------.svg | 28 +- milstd2525/icons/war/shgaucaaas-----.svg | 28 +- milstd2525/icons/war/shgaucaaat-----.svg | 28 +- milstd2525/icons/war/shgaucaaaw-----.svg | 28 +- milstd2525/icons/war/shgaucaac------.svg | 28 +- milstd2525/icons/war/shgaucaad------.svg | 28 +- milstd2525/icons/war/shgaucaal------.svg | 28 +- milstd2525/icons/war/shgaucaam------.svg | 28 +- milstd2525/icons/war/shgaucaao------.svg | 28 +- milstd2525/icons/war/shgaucaaos-----.svg | 28 +- milstd2525/icons/war/shgaucaas------.svg | 28 +- milstd2525/icons/war/shgaucaau------.svg | 28 +- milstd2525/icons/war/shgaucat-------.svg | 28 +- milstd2525/icons/war/shgaucata------.svg | 28 +- milstd2525/icons/war/shgaucath------.svg | 28 +- milstd2525/icons/war/shgaucatl------.svg | 28 +- milstd2525/icons/war/shgaucatm------.svg | 28 +- milstd2525/icons/war/shgaucatr------.svg | 28 +- milstd2525/icons/war/shgaucatw------.svg | 28 +- milstd2525/icons/war/shgaucatwr-----.svg | 28 +- milstd2525/icons/war/shgaucaw-------.svg | 28 +- milstd2525/icons/war/shgaucawa------.svg | 28 +- milstd2525/icons/war/shgaucawh------.svg | 28 +- milstd2525/icons/war/shgaucawl------.svg | 28 +- milstd2525/icons/war/shgaucawm------.svg | 28 +- milstd2525/icons/war/shgaucawr------.svg | 28 +- milstd2525/icons/war/shgaucaws------.svg | 28 +- milstd2525/icons/war/shgaucaww------.svg | 28 +- milstd2525/icons/war/shgaucawwr-----.svg | 28 +- milstd2525/icons/war/shgaucd--------.svg | 28 +- milstd2525/icons/war/shgaucdc-------.svg | 28 +- milstd2525/icons/war/shgaucdg-------.svg | 28 +- milstd2525/icons/war/shgaucdh-------.svg | 28 +- milstd2525/icons/war/shgaucdhh------.svg | 28 +- milstd2525/icons/war/shgaucdhp------.svg | 28 +- milstd2525/icons/war/shgaucdm-------.svg | 28 +- milstd2525/icons/war/shgaucdmh------.svg | 28 +- milstd2525/icons/war/shgaucdml------.svg | 28 +- milstd2525/icons/war/shgaucdmla-----.svg | 28 +- milstd2525/icons/war/shgaucdmm------.svg | 28 +- milstd2525/icons/war/shgaucdo-------.svg | 28 +- milstd2525/icons/war/shgaucds-------.svg | 28 +- milstd2525/icons/war/shgaucdsc------.svg | 28 +- milstd2525/icons/war/shgaucdss------.svg | 28 +- milstd2525/icons/war/shgaucdsv------.svg | 28 +- milstd2525/icons/war/shgaucdt-------.svg | 28 +- milstd2525/icons/war/shgauce--------.svg | 28 +- milstd2525/icons/war/shgaucec-------.svg | 28 +- milstd2525/icons/war/shgauceca------.svg | 28 +- milstd2525/icons/war/shgaucecc------.svg | 28 +- milstd2525/icons/war/shgaucech------.svg | 28 +- milstd2525/icons/war/shgaucecl------.svg | 28 +- milstd2525/icons/war/shgaucecm------.svg | 28 +- milstd2525/icons/war/shgauceco------.svg | 28 +- milstd2525/icons/war/shgaucecr------.svg | 28 +- milstd2525/icons/war/shgaucecs------.svg | 28 +- milstd2525/icons/war/shgaucect------.svg | 28 +- milstd2525/icons/war/shgaucecw------.svg | 28 +- milstd2525/icons/war/shgaucen-------.svg | 28 +- milstd2525/icons/war/shgaucenn------.svg | 28 +- milstd2525/icons/war/shgaucf--------.svg | 28 +- milstd2525/icons/war/shgaucfh-------.svg | 28 +- milstd2525/icons/war/shgaucfha------.svg | 28 +- milstd2525/icons/war/shgaucfhc------.svg | 28 +- milstd2525/icons/war/shgaucfhe------.svg | 28 +- milstd2525/icons/war/shgaucfhh------.svg | 28 +- milstd2525/icons/war/shgaucfhl------.svg | 28 +- milstd2525/icons/war/shgaucfhm------.svg | 28 +- milstd2525/icons/war/shgaucfho------.svg | 28 +- milstd2525/icons/war/shgaucfhs------.svg | 28 +- milstd2525/icons/war/shgaucfhx------.svg | 28 +- milstd2525/icons/war/shgaucfm-------.svg | 28 +- milstd2525/icons/war/shgaucfml------.svg | 28 +- milstd2525/icons/war/shgaucfms------.svg | 28 +- milstd2525/icons/war/shgaucfmt------.svg | 28 +- milstd2525/icons/war/shgaucfmta-----.svg | 28 +- milstd2525/icons/war/shgaucfmtc-----.svg | 28 +- milstd2525/icons/war/shgaucfmto-----.svg | 28 +- milstd2525/icons/war/shgaucfmts-----.svg | 28 +- milstd2525/icons/war/shgaucfmw------.svg | 28 +- milstd2525/icons/war/shgaucfo-------.svg | 28 +- milstd2525/icons/war/shgaucfoa------.svg | 28 +- milstd2525/icons/war/shgaucfol------.svg | 28 +- milstd2525/icons/war/shgaucfoo------.svg | 28 +- milstd2525/icons/war/shgaucfos------.svg | 28 +- milstd2525/icons/war/shgaucfr-------.svg | 28 +- milstd2525/icons/war/shgaucfrm------.svg | 28 +- milstd2525/icons/war/shgaucfrmr-----.svg | 28 +- milstd2525/icons/war/shgaucfrms-----.svg | 28 +- milstd2525/icons/war/shgaucfrmt-----.svg | 28 +- milstd2525/icons/war/shgaucfrs------.svg | 28 +- milstd2525/icons/war/shgaucfrsr-----.svg | 28 +- milstd2525/icons/war/shgaucfrss-----.svg | 28 +- milstd2525/icons/war/shgaucfrst-----.svg | 28 +- milstd2525/icons/war/shgaucfs-------.svg | 28 +- milstd2525/icons/war/shgaucfsa------.svg | 28 +- milstd2525/icons/war/shgaucfsl------.svg | 28 +- milstd2525/icons/war/shgaucfso------.svg | 28 +- milstd2525/icons/war/shgaucfss------.svg | 28 +- milstd2525/icons/war/shgaucft-------.svg | 28 +- milstd2525/icons/war/shgaucfta------.svg | 28 +- milstd2525/icons/war/shgaucftc------.svg | 28 +- milstd2525/icons/war/shgaucftcd-----.svg | 28 +- milstd2525/icons/war/shgaucftcm-----.svg | 28 +- milstd2525/icons/war/shgaucftf------.svg | 28 +- milstd2525/icons/war/shgaucftr------.svg | 28 +- milstd2525/icons/war/shgaucfts------.svg | 28 +- milstd2525/icons/war/shgauci--------.svg | 28 +- milstd2525/icons/war/shgaucia-------.svg | 28 +- milstd2525/icons/war/shgaucic-------.svg | 28 +- milstd2525/icons/war/shgaucii-------.svg | 28 +- milstd2525/icons/war/shgaucil-------.svg | 28 +- milstd2525/icons/war/shgaucim-------.svg | 28 +- milstd2525/icons/war/shgaucin-------.svg | 28 +- milstd2525/icons/war/shgaucio-------.svg | 28 +- milstd2525/icons/war/shgaucis-------.svg | 28 +- milstd2525/icons/war/shgauciz-------.svg | 28 +- milstd2525/icons/war/shgaucm--------.svg | 28 +- milstd2525/icons/war/shgaucms-------.svg | 28 +- milstd2525/icons/war/shgaucmt-------.svg | 28 +- milstd2525/icons/war/shgaucr--------.svg | 28 +- milstd2525/icons/war/shgaucra-------.svg | 28 +- milstd2525/icons/war/shgaucrc-------.svg | 28 +- milstd2525/icons/war/shgaucrh-------.svg | 28 +- milstd2525/icons/war/shgaucrl-------.svg | 28 +- milstd2525/icons/war/shgaucro-------.svg | 28 +- milstd2525/icons/war/shgaucrr-------.svg | 28 +- milstd2525/icons/war/shgaucrrd------.svg | 28 +- milstd2525/icons/war/shgaucrrf------.svg | 28 +- milstd2525/icons/war/shgaucrrl------.svg | 28 +- milstd2525/icons/war/shgaucrs-------.svg | 28 +- milstd2525/icons/war/shgaucrv-------.svg | 28 +- milstd2525/icons/war/shgaucrva------.svg | 28 +- milstd2525/icons/war/shgaucrvg------.svg | 28 +- milstd2525/icons/war/shgaucrvm------.svg | 28 +- milstd2525/icons/war/shgaucrvo------.svg | 28 +- milstd2525/icons/war/shgaucrx-------.svg | 28 +- milstd2525/icons/war/shgaucs--------.svg | 28 +- milstd2525/icons/war/shgaucsa-------.svg | 28 +- milstd2525/icons/war/shgaucsg-------.svg | 28 +- milstd2525/icons/war/shgaucsga------.svg | 28 +- milstd2525/icons/war/shgaucsgd------.svg | 28 +- milstd2525/icons/war/shgaucsgm------.svg | 28 +- milstd2525/icons/war/shgaucsm-------.svg | 28 +- milstd2525/icons/war/shgaucsr-------.svg | 28 +- milstd2525/icons/war/shgaucsw-------.svg | 28 +- milstd2525/icons/war/shgaucv--------.svg | 28 +- milstd2525/icons/war/shgaucvc-------.svg | 28 +- milstd2525/icons/war/shgaucvf-------.svg | 28 +- milstd2525/icons/war/shgaucvfa------.svg | 28 +- milstd2525/icons/war/shgaucvfr------.svg | 28 +- milstd2525/icons/war/shgaucvfu------.svg | 28 +- milstd2525/icons/war/shgaucvr-------.svg | 28 +- milstd2525/icons/war/shgaucvra------.svg | 28 +- milstd2525/icons/war/shgaucvrm------.svg | 28 +- milstd2525/icons/war/shgaucvrs------.svg | 28 +- milstd2525/icons/war/shgaucvru------.svg | 28 +- milstd2525/icons/war/shgaucvruc-----.svg | 28 +- milstd2525/icons/war/shgaucvrue-----.svg | 28 +- milstd2525/icons/war/shgaucvruh-----.svg | 28 +- milstd2525/icons/war/shgaucvrul-----.svg | 28 +- milstd2525/icons/war/shgaucvrum-----.svg | 28 +- milstd2525/icons/war/shgaucvrw------.svg | 28 +- milstd2525/icons/war/shgaucvs-------.svg | 28 +- milstd2525/icons/war/shgaucvu-------.svg | 28 +- milstd2525/icons/war/shgaucvuf------.svg | 28 +- milstd2525/icons/war/shgaucvur------.svg | 28 +- milstd2525/icons/war/shgaucvv-------.svg | 28 +- milstd2525/icons/war/shgauh---------.svg | 28 +- milstd2525/icons/war/shgaus---------.svg | 28 +- milstd2525/icons/war/shgausa--------.svg | 28 +- milstd2525/icons/war/shgausac-------.svg | 28 +- milstd2525/icons/war/shgausaf-------.svg | 28 +- milstd2525/icons/war/shgausafc------.svg | 28 +- milstd2525/icons/war/shgausaft------.svg | 28 +- milstd2525/icons/war/shgausaj-------.svg | 28 +- milstd2525/icons/war/shgausajc------.svg | 28 +- milstd2525/icons/war/shgausajt------.svg | 28 +- milstd2525/icons/war/shgausal-------.svg | 28 +- milstd2525/icons/war/shgausalc------.svg | 28 +- milstd2525/icons/war/shgausalt------.svg | 28 +- milstd2525/icons/war/shgausam-------.svg | 28 +- milstd2525/icons/war/shgausamc------.svg | 28 +- milstd2525/icons/war/shgausamt------.svg | 28 +- milstd2525/icons/war/shgausao-------.svg | 28 +- milstd2525/icons/war/shgausaoc------.svg | 28 +- milstd2525/icons/war/shgausaot------.svg | 28 +- milstd2525/icons/war/shgausap-------.svg | 28 +- milstd2525/icons/war/shgausapb------.svg | 28 +- milstd2525/icons/war/shgausapbc-----.svg | 28 +- milstd2525/icons/war/shgausapbt-----.svg | 28 +- milstd2525/icons/war/shgausapc------.svg | 28 +- milstd2525/icons/war/shgausapm------.svg | 28 +- milstd2525/icons/war/shgausapmc-----.svg | 28 +- milstd2525/icons/war/shgausapmt-----.svg | 28 +- milstd2525/icons/war/shgausapt------.svg | 28 +- milstd2525/icons/war/shgausaq-------.svg | 28 +- milstd2525/icons/war/shgausaqc------.svg | 28 +- milstd2525/icons/war/shgausaqt------.svg | 28 +- milstd2525/icons/war/shgausar-------.svg | 28 +- milstd2525/icons/war/shgausarc------.svg | 28 +- milstd2525/icons/war/shgausart------.svg | 28 +- milstd2525/icons/war/shgausas-------.svg | 28 +- milstd2525/icons/war/shgausasc------.svg | 28 +- milstd2525/icons/war/shgausast------.svg | 28 +- milstd2525/icons/war/shgausat-------.svg | 28 +- milstd2525/icons/war/shgausaw-------.svg | 28 +- milstd2525/icons/war/shgausawc------.svg | 28 +- milstd2525/icons/war/shgausawt------.svg | 28 +- milstd2525/icons/war/shgausax-------.svg | 28 +- milstd2525/icons/war/shgausaxc------.svg | 28 +- milstd2525/icons/war/shgausaxt------.svg | 28 +- milstd2525/icons/war/shgausm--------.svg | 28 +- milstd2525/icons/war/shgausmc-------.svg | 28 +- milstd2525/icons/war/shgausmd-------.svg | 28 +- milstd2525/icons/war/shgausmdc------.svg | 28 +- milstd2525/icons/war/shgausmdt------.svg | 28 +- milstd2525/icons/war/shgausmm-------.svg | 28 +- milstd2525/icons/war/shgausmmc------.svg | 28 +- milstd2525/icons/war/shgausmmt------.svg | 28 +- milstd2525/icons/war/shgausmp-------.svg | 28 +- milstd2525/icons/war/shgausmpc------.svg | 28 +- milstd2525/icons/war/shgausmpt------.svg | 28 +- milstd2525/icons/war/shgausmt-------.svg | 28 +- milstd2525/icons/war/shgausmv-------.svg | 28 +- milstd2525/icons/war/shgausmvc------.svg | 28 +- milstd2525/icons/war/shgausmvt------.svg | 28 +- milstd2525/icons/war/shgauss--------.svg | 28 +- milstd2525/icons/war/shgauss1-------.svg | 28 +- milstd2525/icons/war/shgauss1c------.svg | 28 +- milstd2525/icons/war/shgauss1t------.svg | 28 +- milstd2525/icons/war/shgauss2-------.svg | 28 +- milstd2525/icons/war/shgauss2c------.svg | 28 +- milstd2525/icons/war/shgauss2t------.svg | 28 +- milstd2525/icons/war/shgauss3-------.svg | 28 +- milstd2525/icons/war/shgauss3a------.svg | 28 +- milstd2525/icons/war/shgauss3ac-----.svg | 28 +- milstd2525/icons/war/shgauss3at-----.svg | 28 +- milstd2525/icons/war/shgauss3c------.svg | 28 +- milstd2525/icons/war/shgauss3t------.svg | 28 +- milstd2525/icons/war/shgauss4-------.svg | 28 +- milstd2525/icons/war/shgauss4c------.svg | 28 +- milstd2525/icons/war/shgauss4t------.svg | 28 +- milstd2525/icons/war/shgauss5-------.svg | 28 +- milstd2525/icons/war/shgauss5c------.svg | 28 +- milstd2525/icons/war/shgauss5t------.svg | 28 +- milstd2525/icons/war/shgauss6-------.svg | 28 +- milstd2525/icons/war/shgauss6c------.svg | 28 +- milstd2525/icons/war/shgauss6t------.svg | 28 +- milstd2525/icons/war/shgauss7-------.svg | 28 +- milstd2525/icons/war/shgauss7c------.svg | 28 +- milstd2525/icons/war/shgauss7t------.svg | 28 +- milstd2525/icons/war/shgauss8-------.svg | 28 +- milstd2525/icons/war/shgauss8c------.svg | 28 +- milstd2525/icons/war/shgauss8t------.svg | 28 +- milstd2525/icons/war/shgauss9-------.svg | 28 +- milstd2525/icons/war/shgauss9c------.svg | 28 +- milstd2525/icons/war/shgauss9t------.svg | 28 +- milstd2525/icons/war/shgaussc-------.svg | 28 +- milstd2525/icons/war/shgaussl-------.svg | 28 +- milstd2525/icons/war/shgausslc------.svg | 28 +- milstd2525/icons/war/shgausslt------.svg | 28 +- milstd2525/icons/war/shgausst-------.svg | 28 +- milstd2525/icons/war/shgaussw-------.svg | 28 +- milstd2525/icons/war/shgausswc------.svg | 28 +- milstd2525/icons/war/shgausswp------.svg | 28 +- milstd2525/icons/war/shgausswpc-----.svg | 28 +- milstd2525/icons/war/shgausswpt-----.svg | 28 +- milstd2525/icons/war/shgausswt------.svg | 28 +- milstd2525/icons/war/shgaussx-------.svg | 28 +- milstd2525/icons/war/shgaussxc------.svg | 28 +- milstd2525/icons/war/shgaussxt------.svg | 28 +- milstd2525/icons/war/shgaust--------.svg | 28 +- milstd2525/icons/war/shgausta-------.svg | 28 +- milstd2525/icons/war/shgaustac------.svg | 28 +- milstd2525/icons/war/shgaustat------.svg | 28 +- milstd2525/icons/war/shgaustc-------.svg | 28 +- milstd2525/icons/war/shgausti-------.svg | 28 +- milstd2525/icons/war/shgaustic------.svg | 28 +- milstd2525/icons/war/shgaustit------.svg | 28 +- milstd2525/icons/war/shgaustm-------.svg | 28 +- milstd2525/icons/war/shgaustmc------.svg | 28 +- milstd2525/icons/war/shgaustmt------.svg | 28 +- milstd2525/icons/war/shgaustr-------.svg | 28 +- milstd2525/icons/war/shgaustrc------.svg | 28 +- milstd2525/icons/war/shgaustrt------.svg | 28 +- milstd2525/icons/war/shgausts-------.svg | 28 +- milstd2525/icons/war/shgaustsc------.svg | 28 +- milstd2525/icons/war/shgaustst------.svg | 28 +- milstd2525/icons/war/shgaustt-------.svg | 28 +- milstd2525/icons/war/shgausx--------.svg | 28 +- milstd2525/icons/war/shgausxc-------.svg | 28 +- milstd2525/icons/war/shgausxe-------.svg | 28 +- milstd2525/icons/war/shgausxec------.svg | 28 +- milstd2525/icons/war/shgausxet------.svg | 28 +- milstd2525/icons/war/shgausxh-------.svg | 28 +- milstd2525/icons/war/shgausxhc------.svg | 28 +- milstd2525/icons/war/shgausxht------.svg | 28 +- milstd2525/icons/war/shgausxo-------.svg | 28 +- milstd2525/icons/war/shgausxoc------.svg | 28 +- milstd2525/icons/war/shgausxom------.svg | 28 +- milstd2525/icons/war/shgausxomc-----.svg | 28 +- milstd2525/icons/war/shgausxomt-----.svg | 28 +- milstd2525/icons/war/shgausxot------.svg | 28 +- milstd2525/icons/war/shgausxr-------.svg | 28 +- milstd2525/icons/war/shgausxrc------.svg | 28 +- milstd2525/icons/war/shgausxrt------.svg | 28 +- milstd2525/icons/war/shgausxt-------.svg | 28 +- milstd2525/icons/war/shgauu---------.svg | 28 +- milstd2525/icons/war/shgauua--------.svg | 28 +- milstd2525/icons/war/shgauuab-------.svg | 28 +- milstd2525/icons/war/shgauuabr------.svg | 28 +- milstd2525/icons/war/shgauuac-------.svg | 28 +- milstd2525/icons/war/shgauuacc------.svg | 28 +- milstd2525/icons/war/shgauuacck-----.svg | 28 +- milstd2525/icons/war/shgauuaccm-----.svg | 28 +- milstd2525/icons/war/shgauuacr------.svg | 28 +- milstd2525/icons/war/shgauuacrs-----.svg | 28 +- milstd2525/icons/war/shgauuacrw-----.svg | 28 +- milstd2525/icons/war/shgauuacs------.svg | 28 +- milstd2525/icons/war/shgauuacsa-----.svg | 28 +- milstd2525/icons/war/shgauuacsm-----.svg | 28 +- milstd2525/icons/war/shgauuad-------.svg | 28 +- milstd2525/icons/war/shgauuan-------.svg | 28 +- milstd2525/icons/war/shgauue--------.svg | 28 +- milstd2525/icons/war/shgauui--------.svg | 28 +- milstd2525/icons/war/shgauul--------.svg | 28 +- milstd2525/icons/war/shgauulc-------.svg | 28 +- milstd2525/icons/war/shgauuld-------.svg | 28 +- milstd2525/icons/war/shgauulf-------.svg | 28 +- milstd2525/icons/war/shgauulm-------.svg | 28 +- milstd2525/icons/war/shgauuls-------.svg | 28 +- milstd2525/icons/war/shgauum--------.svg | 28 +- milstd2525/icons/war/shgauuma-------.svg | 28 +- milstd2525/icons/war/shgauumc-------.svg | 28 +- milstd2525/icons/war/shgauumj-------.svg | 28 +- milstd2525/icons/war/shgauummo------.svg | 28 +- milstd2525/icons/war/shgauumo-------.svg | 28 +- milstd2525/icons/war/shgauumq-------.svg | 28 +- milstd2525/icons/war/shgauumr-------.svg | 28 +- milstd2525/icons/war/shgauumrg------.svg | 28 +- milstd2525/icons/war/shgauumrs------.svg | 28 +- milstd2525/icons/war/shgauumrss-----.svg | 28 +- milstd2525/icons/war/shgauumrx------.svg | 28 +- milstd2525/icons/war/shgauums-------.svg | 28 +- milstd2525/icons/war/shgauumse------.svg | 28 +- milstd2525/icons/war/shgauumsea-----.svg | 28 +- milstd2525/icons/war/shgauumsec-----.svg | 28 +- milstd2525/icons/war/shgauumsed-----.svg | 28 +- milstd2525/icons/war/shgauumsei-----.svg | 28 +- milstd2525/icons/war/shgauumsej-----.svg | 28 +- milstd2525/icons/war/shgauumset-----.svg | 28 +- milstd2525/icons/war/shgauumt-------.svg | 28 +- milstd2525/icons/war/shgauup--------.svg | 28 +- milstd2525/icons/war/shgauus--------.svg | 28 +- milstd2525/icons/war/shgauusa-------.svg | 28 +- milstd2525/icons/war/shgauusc-------.svg | 28 +- milstd2525/icons/war/shgauuscl------.svg | 28 +- milstd2525/icons/war/shgauusf-------.svg | 28 +- milstd2525/icons/war/shgauusm-------.svg | 28 +- milstd2525/icons/war/shgauusml------.svg | 28 +- milstd2525/icons/war/shgauusmn------.svg | 28 +- milstd2525/icons/war/shgauusms------.svg | 28 +- milstd2525/icons/war/shgauuso-------.svg | 28 +- milstd2525/icons/war/shgauusr-------.svg | 28 +- milstd2525/icons/war/shgauusrs------.svg | 28 +- milstd2525/icons/war/shgauusrt------.svg | 28 +- milstd2525/icons/war/shgauusrw------.svg | 28 +- milstd2525/icons/war/shgauuss-------.svg | 28 +- milstd2525/icons/war/shgauusw-------.svg | 28 +- milstd2525/icons/war/shgauusx-------.svg | 28 +- milstd2525/icons/war/shgp-----------.svg | 28 +- milstd2525/icons/war/shgpe----------.svg | 28 +- milstd2525/icons/war/shgpes---------.svg | 28 +- milstd2525/icons/war/shgpese--------.svg | 28 +- milstd2525/icons/war/shgpesr--------.svg | 28 +- milstd2525/icons/war/shgpev---------.svg | 28 +- milstd2525/icons/war/shgpeva--------.svg | 28 +- milstd2525/icons/war/shgpevaa-------.svg | 28 +- milstd2525/icons/war/shgpevaar------.svg | 28 +- milstd2525/icons/war/shgpevac-------.svg | 28 +- milstd2525/icons/war/shgpevai-------.svg | 28 +- milstd2525/icons/war/shgpeval-------.svg | 28 +- milstd2525/icons/war/shgpevas-------.svg | 28 +- milstd2525/icons/war/shgpevat-------.svg | 28 +- milstd2525/icons/war/shgpevath------.svg | 28 +- milstd2525/icons/war/shgpevathr-----.svg | 28 +- milstd2525/icons/war/shgpevatl------.svg | 28 +- milstd2525/icons/war/shgpevatlr-----.svg | 28 +- milstd2525/icons/war/shgpevatm------.svg | 28 +- milstd2525/icons/war/shgpevatmr-----.svg | 28 +- milstd2525/icons/war/shgpevc--------.svg | 28 +- milstd2525/icons/war/shgpevca-------.svg | 28 +- milstd2525/icons/war/shgpevcah------.svg | 28 +- milstd2525/icons/war/shgpevcal------.svg | 28 +- milstd2525/icons/war/shgpevcam------.svg | 28 +- milstd2525/icons/war/shgpevcf-------.svg | 28 +- milstd2525/icons/war/shgpevcfh------.svg | 28 +- milstd2525/icons/war/shgpevcfl------.svg | 28 +- milstd2525/icons/war/shgpevcfm------.svg | 28 +- milstd2525/icons/war/shgpevcj-------.svg | 28 +- milstd2525/icons/war/shgpevcjh------.svg | 28 +- milstd2525/icons/war/shgpevcjl------.svg | 28 +- milstd2525/icons/war/shgpevcjm------.svg | 28 +- milstd2525/icons/war/shgpevcm-------.svg | 28 +- milstd2525/icons/war/shgpevcmh------.svg | 28 +- milstd2525/icons/war/shgpevcml------.svg | 28 +- milstd2525/icons/war/shgpevcmm------.svg | 28 +- milstd2525/icons/war/shgpevco-------.svg | 28 +- milstd2525/icons/war/shgpevcoh------.svg | 28 +- milstd2525/icons/war/shgpevcol------.svg | 28 +- milstd2525/icons/war/shgpevcom------.svg | 28 +- milstd2525/icons/war/shgpevct-------.svg | 28 +- milstd2525/icons/war/shgpevcth------.svg | 28 +- milstd2525/icons/war/shgpevctl------.svg | 28 +- milstd2525/icons/war/shgpevctm------.svg | 28 +- milstd2525/icons/war/shgpevcu-------.svg | 28 +- milstd2525/icons/war/shgpevcuh------.svg | 28 +- milstd2525/icons/war/shgpevcul------.svg | 28 +- milstd2525/icons/war/shgpevcum------.svg | 28 +- milstd2525/icons/war/shgpeve--------.svg | 28 +- milstd2525/icons/war/shgpevea-------.svg | 28 +- milstd2525/icons/war/shgpeveaa------.svg | 28 +- milstd2525/icons/war/shgpeveat------.svg | 28 +- milstd2525/icons/war/shgpeveb-------.svg | 28 +- milstd2525/icons/war/shgpevec-------.svg | 28 +- milstd2525/icons/war/shgpeved-------.svg | 28 +- milstd2525/icons/war/shgpeveda------.svg | 28 +- milstd2525/icons/war/shgpevee-------.svg | 28 +- milstd2525/icons/war/shgpevef-------.svg | 28 +- milstd2525/icons/war/shgpeveh-------.svg | 28 +- milstd2525/icons/war/shgpevem-------.svg | 28 +- milstd2525/icons/war/shgpeveml------.svg | 28 +- milstd2525/icons/war/shgpevemv------.svg | 28 +- milstd2525/icons/war/shgpever-------.svg | 28 +- milstd2525/icons/war/shgpeves-------.svg | 28 +- milstd2525/icons/war/shgpevm--------.svg | 28 +- milstd2525/icons/war/shgpevs--------.svg | 28 +- milstd2525/icons/war/shgpevsc-------.svg | 28 +- milstd2525/icons/war/shgpevsp-------.svg | 28 +- milstd2525/icons/war/shgpevsr-------.svg | 28 +- milstd2525/icons/war/shgpevst-------.svg | 28 +- milstd2525/icons/war/shgpevsw-------.svg | 28 +- milstd2525/icons/war/shgpevt--------.svg | 28 +- milstd2525/icons/war/shgpevu--------.svg | 28 +- milstd2525/icons/war/shgpevua-------.svg | 28 +- milstd2525/icons/war/shgpevuaa------.svg | 28 +- milstd2525/icons/war/shgpevub-------.svg | 28 +- milstd2525/icons/war/shgpevul-------.svg | 28 +- milstd2525/icons/war/shgpevur-------.svg | 28 +- milstd2525/icons/war/shgpevus-------.svg | 28 +- milstd2525/icons/war/shgpevush------.svg | 28 +- milstd2525/icons/war/shgpevusl------.svg | 28 +- milstd2525/icons/war/shgpevusm------.svg | 28 +- milstd2525/icons/war/shgpevut-------.svg | 28 +- milstd2525/icons/war/shgpevuth------.svg | 28 +- milstd2525/icons/war/shgpevutl------.svg | 28 +- milstd2525/icons/war/shgpevux-------.svg | 28 +- milstd2525/icons/war/shgpewa--------.svg | 28 +- milstd2525/icons/war/shgpewah-------.svg | 28 +- milstd2525/icons/war/shgpewal-------.svg | 28 +- milstd2525/icons/war/shgpewam-------.svg | 28 +- milstd2525/icons/war/shgpewd--------.svg | 28 +- milstd2525/icons/war/shgpewdh-------.svg | 28 +- milstd2525/icons/war/shgpewdhs------.svg | 28 +- milstd2525/icons/war/shgpewdl-------.svg | 28 +- milstd2525/icons/war/shgpewdls------.svg | 28 +- milstd2525/icons/war/shgpewdm-------.svg | 28 +- milstd2525/icons/war/shgpewdms------.svg | 28 +- milstd2525/icons/war/shgpewg--------.svg | 28 +- milstd2525/icons/war/shgpewgh-------.svg | 28 +- milstd2525/icons/war/shgpewgl-------.svg | 28 +- milstd2525/icons/war/shgpewgm-------.svg | 28 +- milstd2525/icons/war/shgpewgr-------.svg | 28 +- milstd2525/icons/war/shgpewh--------.svg | 28 +- milstd2525/icons/war/shgpewhh-------.svg | 28 +- milstd2525/icons/war/shgpewhhs------.svg | 28 +- milstd2525/icons/war/shgpewhl-------.svg | 28 +- milstd2525/icons/war/shgpewhls------.svg | 28 +- milstd2525/icons/war/shgpewhm-------.svg | 28 +- milstd2525/icons/war/shgpewhms------.svg | 28 +- milstd2525/icons/war/shgpewm--------.svg | 28 +- milstd2525/icons/war/shgpewma-------.svg | 28 +- milstd2525/icons/war/shgpewmai------.svg | 28 +- milstd2525/icons/war/shgpewmaie-----.svg | 28 +- milstd2525/icons/war/shgpewmair-----.svg | 28 +- milstd2525/icons/war/shgpewmal------.svg | 28 +- milstd2525/icons/war/shgpewmale-----.svg | 28 +- milstd2525/icons/war/shgpewmalr-----.svg | 28 +- milstd2525/icons/war/shgpewmas------.svg | 28 +- milstd2525/icons/war/shgpewmase-----.svg | 28 +- milstd2525/icons/war/shgpewmasr-----.svg | 28 +- milstd2525/icons/war/shgpewmat------.svg | 28 +- milstd2525/icons/war/shgpewmate-----.svg | 28 +- milstd2525/icons/war/shgpewmatr-----.svg | 28 +- milstd2525/icons/war/shgpewms-------.svg | 28 +- milstd2525/icons/war/shgpewmsi------.svg | 28 +- milstd2525/icons/war/shgpewmsl------.svg | 28 +- milstd2525/icons/war/shgpewmss------.svg | 28 +- milstd2525/icons/war/shgpewmt-------.svg | 28 +- milstd2525/icons/war/shgpewmth------.svg | 28 +- milstd2525/icons/war/shgpewmtl------.svg | 28 +- milstd2525/icons/war/shgpewmtm------.svg | 28 +- milstd2525/icons/war/shgpewo--------.svg | 28 +- milstd2525/icons/war/shgpewoh-------.svg | 28 +- milstd2525/icons/war/shgpewol-------.svg | 28 +- milstd2525/icons/war/shgpewom-------.svg | 28 +- milstd2525/icons/war/shgpewr--------.svg | 28 +- milstd2525/icons/war/shgpewrh-------.svg | 28 +- milstd2525/icons/war/shgpewrl-------.svg | 28 +- milstd2525/icons/war/shgpewrr-------.svg | 28 +- milstd2525/icons/war/shgpews--------.svg | 28 +- milstd2525/icons/war/shgpewsh-------.svg | 28 +- milstd2525/icons/war/shgpewsl-------.svg | 28 +- milstd2525/icons/war/shgpewsm-------.svg | 28 +- milstd2525/icons/war/shgpewt--------.svg | 28 +- milstd2525/icons/war/shgpewth-------.svg | 28 +- milstd2525/icons/war/shgpewtl-------.svg | 28 +- milstd2525/icons/war/shgpewtm-------.svg | 28 +- milstd2525/icons/war/shgpewx--------.svg | 28 +- milstd2525/icons/war/shgpewxh-------.svg | 28 +- milstd2525/icons/war/shgpewxl-------.svg | 28 +- milstd2525/icons/war/shgpewxm-------.svg | 28 +- milstd2525/icons/war/shgpewz--------.svg | 28 +- milstd2525/icons/war/shgpewzh-------.svg | 28 +- milstd2525/icons/war/shgpewzl-------.svg | 28 +- milstd2525/icons/war/shgpewzm-------.svg | 28 +- milstd2525/icons/war/shgpexf--------.svg | 28 +- milstd2525/icons/war/shgpexi--------.svg | 28 +- milstd2525/icons/war/shgpexl--------.svg | 28 +- milstd2525/icons/war/shgpexm--------.svg | 28 +- milstd2525/icons/war/shgpexmc-------.svg | 28 +- milstd2525/icons/war/shgpexml-------.svg | 28 +- milstd2525/icons/war/shgpexn--------.svg | 28 +- milstd2525/icons/war/shgpi----------.svg | 28 +- milstd2525/icons/war/shgpib---------.svg | 28 +- milstd2525/icons/war/shgpiba--------.svg | 28 +- milstd2525/icons/war/shgpibn--------.svg | 28 +- milstd2525/icons/war/shgpie---------.svg | 28 +- milstd2525/icons/war/shgpig---------.svg | 28 +- milstd2525/icons/war/shgpima--------.svg | 28 +- milstd2525/icons/war/shgpimc--------.svg | 28 +- milstd2525/icons/war/shgpime--------.svg | 28 +- milstd2525/icons/war/shgpimf--------.svg | 28 +- milstd2525/icons/war/shgpimfa-------.svg | 28 +- milstd2525/icons/war/shgpimfp-------.svg | 28 +- milstd2525/icons/war/shgpimfpw------.svg | 28 +- milstd2525/icons/war/shgpimfs-------.svg | 28 +- milstd2525/icons/war/shgpimg--------.svg | 28 +- milstd2525/icons/war/shgpimm--------.svg | 28 +- milstd2525/icons/war/shgpimn--------.svg | 28 +- milstd2525/icons/war/shgpimnb-------.svg | 28 +- milstd2525/icons/war/shgpims--------.svg | 28 +- milstd2525/icons/war/shgpimv--------.svg | 28 +- milstd2525/icons/war/shgpip---------.svg | 28 +- milstd2525/icons/war/shgpipd--------.svg | 28 +- milstd2525/icons/war/shgpir---------.svg | 28 +- milstd2525/icons/war/shgpirm--------.svg | 28 +- milstd2525/icons/war/shgpirn--------.svg | 28 +- milstd2525/icons/war/shgpirnb-------.svg | 28 +- milstd2525/icons/war/shgpirnc-------.svg | 28 +- milstd2525/icons/war/shgpirnn-------.svg | 28 +- milstd2525/icons/war/shgpirp--------.svg | 28 +- milstd2525/icons/war/shgpit---------.svg | 28 +- milstd2525/icons/war/shgpiu---------.svg | 28 +- milstd2525/icons/war/shgpiue--------.svg | 28 +- milstd2525/icons/war/shgpiued-------.svg | 28 +- milstd2525/icons/war/shgpiuef-------.svg | 28 +- milstd2525/icons/war/shgpiuen-------.svg | 28 +- milstd2525/icons/war/shgpiup--------.svg | 28 +- milstd2525/icons/war/shgpiur--------.svg | 28 +- milstd2525/icons/war/shgpiut--------.svg | 28 +- milstd2525/icons/war/shgpix---------.svg | 28 +- milstd2525/icons/war/shgpixh--------.svg | 28 +- milstd2525/icons/war/shgpu----------.svg | 28 +- milstd2525/icons/war/shgpuc---------.svg | 28 +- milstd2525/icons/war/shgpuca--------.svg | 28 +- milstd2525/icons/war/shgpucaa-------.svg | 28 +- milstd2525/icons/war/shgpucaaa------.svg | 28 +- milstd2525/icons/war/shgpucaaas-----.svg | 28 +- milstd2525/icons/war/shgpucaaat-----.svg | 28 +- milstd2525/icons/war/shgpucaaaw-----.svg | 28 +- milstd2525/icons/war/shgpucaac------.svg | 28 +- milstd2525/icons/war/shgpucaad------.svg | 28 +- milstd2525/icons/war/shgpucaal------.svg | 28 +- milstd2525/icons/war/shgpucaam------.svg | 28 +- milstd2525/icons/war/shgpucaao------.svg | 28 +- milstd2525/icons/war/shgpucaaos-----.svg | 28 +- milstd2525/icons/war/shgpucaas------.svg | 28 +- milstd2525/icons/war/shgpucaau------.svg | 28 +- milstd2525/icons/war/shgpucat-------.svg | 28 +- milstd2525/icons/war/shgpucata------.svg | 28 +- milstd2525/icons/war/shgpucath------.svg | 28 +- milstd2525/icons/war/shgpucatl------.svg | 28 +- milstd2525/icons/war/shgpucatm------.svg | 28 +- milstd2525/icons/war/shgpucatr------.svg | 28 +- milstd2525/icons/war/shgpucatw------.svg | 28 +- milstd2525/icons/war/shgpucatwr-----.svg | 28 +- milstd2525/icons/war/shgpucaw-------.svg | 28 +- milstd2525/icons/war/shgpucawa------.svg | 28 +- milstd2525/icons/war/shgpucawh------.svg | 28 +- milstd2525/icons/war/shgpucawl------.svg | 28 +- milstd2525/icons/war/shgpucawm------.svg | 28 +- milstd2525/icons/war/shgpucawr------.svg | 28 +- milstd2525/icons/war/shgpucaws------.svg | 28 +- milstd2525/icons/war/shgpucaww------.svg | 28 +- milstd2525/icons/war/shgpucawwr-----.svg | 28 +- milstd2525/icons/war/shgpucd--------.svg | 28 +- milstd2525/icons/war/shgpucdc-------.svg | 28 +- milstd2525/icons/war/shgpucdg-------.svg | 28 +- milstd2525/icons/war/shgpucdh-------.svg | 28 +- milstd2525/icons/war/shgpucdhh------.svg | 28 +- milstd2525/icons/war/shgpucdhp------.svg | 28 +- milstd2525/icons/war/shgpucdm-------.svg | 28 +- milstd2525/icons/war/shgpucdmh------.svg | 28 +- milstd2525/icons/war/shgpucdml------.svg | 28 +- milstd2525/icons/war/shgpucdmla-----.svg | 28 +- milstd2525/icons/war/shgpucdmm------.svg | 28 +- milstd2525/icons/war/shgpucdo-------.svg | 28 +- milstd2525/icons/war/shgpucds-------.svg | 28 +- milstd2525/icons/war/shgpucdsc------.svg | 28 +- milstd2525/icons/war/shgpucdss------.svg | 28 +- milstd2525/icons/war/shgpucdsv------.svg | 28 +- milstd2525/icons/war/shgpucdt-------.svg | 28 +- milstd2525/icons/war/shgpuce--------.svg | 28 +- milstd2525/icons/war/shgpucec-------.svg | 28 +- milstd2525/icons/war/shgpuceca------.svg | 28 +- milstd2525/icons/war/shgpucecc------.svg | 28 +- milstd2525/icons/war/shgpucech------.svg | 28 +- milstd2525/icons/war/shgpucecl------.svg | 28 +- milstd2525/icons/war/shgpucecm------.svg | 28 +- milstd2525/icons/war/shgpuceco------.svg | 28 +- milstd2525/icons/war/shgpucecr------.svg | 28 +- milstd2525/icons/war/shgpucecs------.svg | 28 +- milstd2525/icons/war/shgpucect------.svg | 28 +- milstd2525/icons/war/shgpucecw------.svg | 28 +- milstd2525/icons/war/shgpucen-------.svg | 28 +- milstd2525/icons/war/shgpucenn------.svg | 28 +- milstd2525/icons/war/shgpucf--------.svg | 28 +- milstd2525/icons/war/shgpucfh-------.svg | 28 +- milstd2525/icons/war/shgpucfha------.svg | 28 +- milstd2525/icons/war/shgpucfhc------.svg | 28 +- milstd2525/icons/war/shgpucfhe------.svg | 28 +- milstd2525/icons/war/shgpucfhh------.svg | 28 +- milstd2525/icons/war/shgpucfhl------.svg | 28 +- milstd2525/icons/war/shgpucfhm------.svg | 28 +- milstd2525/icons/war/shgpucfho------.svg | 28 +- milstd2525/icons/war/shgpucfhs------.svg | 28 +- milstd2525/icons/war/shgpucfhx------.svg | 28 +- milstd2525/icons/war/shgpucfm-------.svg | 28 +- milstd2525/icons/war/shgpucfml------.svg | 28 +- milstd2525/icons/war/shgpucfms------.svg | 28 +- milstd2525/icons/war/shgpucfmt------.svg | 28 +- milstd2525/icons/war/shgpucfmta-----.svg | 28 +- milstd2525/icons/war/shgpucfmtc-----.svg | 28 +- milstd2525/icons/war/shgpucfmto-----.svg | 28 +- milstd2525/icons/war/shgpucfmts-----.svg | 28 +- milstd2525/icons/war/shgpucfmw------.svg | 28 +- milstd2525/icons/war/shgpucfo-------.svg | 28 +- milstd2525/icons/war/shgpucfoa------.svg | 28 +- milstd2525/icons/war/shgpucfol------.svg | 28 +- milstd2525/icons/war/shgpucfoo------.svg | 28 +- milstd2525/icons/war/shgpucfos------.svg | 28 +- milstd2525/icons/war/shgpucfr-------.svg | 28 +- milstd2525/icons/war/shgpucfrm------.svg | 28 +- milstd2525/icons/war/shgpucfrmr-----.svg | 28 +- milstd2525/icons/war/shgpucfrms-----.svg | 28 +- milstd2525/icons/war/shgpucfrmt-----.svg | 28 +- milstd2525/icons/war/shgpucfrs------.svg | 28 +- milstd2525/icons/war/shgpucfrsr-----.svg | 28 +- milstd2525/icons/war/shgpucfrss-----.svg | 28 +- milstd2525/icons/war/shgpucfrst-----.svg | 28 +- milstd2525/icons/war/shgpucfs-------.svg | 28 +- milstd2525/icons/war/shgpucfsa------.svg | 28 +- milstd2525/icons/war/shgpucfsl------.svg | 28 +- milstd2525/icons/war/shgpucfso------.svg | 28 +- milstd2525/icons/war/shgpucfss------.svg | 28 +- milstd2525/icons/war/shgpucft-------.svg | 28 +- milstd2525/icons/war/shgpucfta------.svg | 28 +- milstd2525/icons/war/shgpucftc------.svg | 28 +- milstd2525/icons/war/shgpucftcd-----.svg | 28 +- milstd2525/icons/war/shgpucftcm-----.svg | 28 +- milstd2525/icons/war/shgpucftf------.svg | 28 +- milstd2525/icons/war/shgpucftr------.svg | 28 +- milstd2525/icons/war/shgpucfts------.svg | 28 +- milstd2525/icons/war/shgpuci--------.svg | 28 +- milstd2525/icons/war/shgpucia-------.svg | 28 +- milstd2525/icons/war/shgpucic-------.svg | 28 +- milstd2525/icons/war/shgpucii-------.svg | 28 +- milstd2525/icons/war/shgpucil-------.svg | 28 +- milstd2525/icons/war/shgpucim-------.svg | 28 +- milstd2525/icons/war/shgpucin-------.svg | 28 +- milstd2525/icons/war/shgpucio-------.svg | 28 +- milstd2525/icons/war/shgpucis-------.svg | 28 +- milstd2525/icons/war/shgpuciz-------.svg | 28 +- milstd2525/icons/war/shgpucm--------.svg | 28 +- milstd2525/icons/war/shgpucms-------.svg | 28 +- milstd2525/icons/war/shgpucmt-------.svg | 28 +- milstd2525/icons/war/shgpucr--------.svg | 28 +- milstd2525/icons/war/shgpucra-------.svg | 28 +- milstd2525/icons/war/shgpucrc-------.svg | 28 +- milstd2525/icons/war/shgpucrh-------.svg | 28 +- milstd2525/icons/war/shgpucrl-------.svg | 28 +- milstd2525/icons/war/shgpucro-------.svg | 28 +- milstd2525/icons/war/shgpucrr-------.svg | 28 +- milstd2525/icons/war/shgpucrrd------.svg | 28 +- milstd2525/icons/war/shgpucrrf------.svg | 28 +- milstd2525/icons/war/shgpucrrl------.svg | 28 +- milstd2525/icons/war/shgpucrs-------.svg | 28 +- milstd2525/icons/war/shgpucrv-------.svg | 28 +- milstd2525/icons/war/shgpucrva------.svg | 28 +- milstd2525/icons/war/shgpucrvg------.svg | 28 +- milstd2525/icons/war/shgpucrvm------.svg | 28 +- milstd2525/icons/war/shgpucrvo------.svg | 28 +- milstd2525/icons/war/shgpucrx-------.svg | 28 +- milstd2525/icons/war/shgpucs--------.svg | 28 +- milstd2525/icons/war/shgpucsa-------.svg | 28 +- milstd2525/icons/war/shgpucsg-------.svg | 28 +- milstd2525/icons/war/shgpucsga------.svg | 28 +- milstd2525/icons/war/shgpucsgd------.svg | 28 +- milstd2525/icons/war/shgpucsgm------.svg | 28 +- milstd2525/icons/war/shgpucsm-------.svg | 28 +- milstd2525/icons/war/shgpucsr-------.svg | 28 +- milstd2525/icons/war/shgpucsw-------.svg | 28 +- milstd2525/icons/war/shgpucv--------.svg | 28 +- milstd2525/icons/war/shgpucvc-------.svg | 28 +- milstd2525/icons/war/shgpucvf-------.svg | 28 +- milstd2525/icons/war/shgpucvfa------.svg | 28 +- milstd2525/icons/war/shgpucvfr------.svg | 28 +- milstd2525/icons/war/shgpucvfu------.svg | 28 +- milstd2525/icons/war/shgpucvr-------.svg | 28 +- milstd2525/icons/war/shgpucvra------.svg | 28 +- milstd2525/icons/war/shgpucvrm------.svg | 28 +- milstd2525/icons/war/shgpucvrs------.svg | 28 +- milstd2525/icons/war/shgpucvru------.svg | 28 +- milstd2525/icons/war/shgpucvruc-----.svg | 28 +- milstd2525/icons/war/shgpucvrue-----.svg | 28 +- milstd2525/icons/war/shgpucvruh-----.svg | 28 +- milstd2525/icons/war/shgpucvrul-----.svg | 28 +- milstd2525/icons/war/shgpucvrum-----.svg | 28 +- milstd2525/icons/war/shgpucvrw------.svg | 28 +- milstd2525/icons/war/shgpucvs-------.svg | 28 +- milstd2525/icons/war/shgpucvu-------.svg | 28 +- milstd2525/icons/war/shgpucvuf------.svg | 28 +- milstd2525/icons/war/shgpucvur------.svg | 28 +- milstd2525/icons/war/shgpucvv-------.svg | 28 +- milstd2525/icons/war/shgpuh---------.svg | 28 +- milstd2525/icons/war/shgpus---------.svg | 28 +- milstd2525/icons/war/shgpusa--------.svg | 28 +- milstd2525/icons/war/shgpusac-------.svg | 28 +- milstd2525/icons/war/shgpusaf-------.svg | 28 +- milstd2525/icons/war/shgpusafc------.svg | 28 +- milstd2525/icons/war/shgpusaft------.svg | 28 +- milstd2525/icons/war/shgpusaj-------.svg | 28 +- milstd2525/icons/war/shgpusajc------.svg | 28 +- milstd2525/icons/war/shgpusajt------.svg | 28 +- milstd2525/icons/war/shgpusal-------.svg | 28 +- milstd2525/icons/war/shgpusalc------.svg | 28 +- milstd2525/icons/war/shgpusalt------.svg | 28 +- milstd2525/icons/war/shgpusam-------.svg | 28 +- milstd2525/icons/war/shgpusamc------.svg | 28 +- milstd2525/icons/war/shgpusamt------.svg | 28 +- milstd2525/icons/war/shgpusao-------.svg | 28 +- milstd2525/icons/war/shgpusaoc------.svg | 28 +- milstd2525/icons/war/shgpusaot------.svg | 28 +- milstd2525/icons/war/shgpusap-------.svg | 28 +- milstd2525/icons/war/shgpusapb------.svg | 28 +- milstd2525/icons/war/shgpusapbc-----.svg | 28 +- milstd2525/icons/war/shgpusapbt-----.svg | 28 +- milstd2525/icons/war/shgpusapc------.svg | 28 +- milstd2525/icons/war/shgpusapm------.svg | 28 +- milstd2525/icons/war/shgpusapmc-----.svg | 28 +- milstd2525/icons/war/shgpusapmt-----.svg | 28 +- milstd2525/icons/war/shgpusapt------.svg | 28 +- milstd2525/icons/war/shgpusaq-------.svg | 28 +- milstd2525/icons/war/shgpusaqc------.svg | 28 +- milstd2525/icons/war/shgpusaqt------.svg | 28 +- milstd2525/icons/war/shgpusar-------.svg | 28 +- milstd2525/icons/war/shgpusarc------.svg | 28 +- milstd2525/icons/war/shgpusart------.svg | 28 +- milstd2525/icons/war/shgpusas-------.svg | 28 +- milstd2525/icons/war/shgpusasc------.svg | 28 +- milstd2525/icons/war/shgpusast------.svg | 28 +- milstd2525/icons/war/shgpusat-------.svg | 28 +- milstd2525/icons/war/shgpusaw-------.svg | 28 +- milstd2525/icons/war/shgpusawc------.svg | 28 +- milstd2525/icons/war/shgpusawt------.svg | 28 +- milstd2525/icons/war/shgpusax-------.svg | 28 +- milstd2525/icons/war/shgpusaxc------.svg | 28 +- milstd2525/icons/war/shgpusaxt------.svg | 28 +- milstd2525/icons/war/shgpusm--------.svg | 28 +- milstd2525/icons/war/shgpusmc-------.svg | 28 +- milstd2525/icons/war/shgpusmd-------.svg | 28 +- milstd2525/icons/war/shgpusmdc------.svg | 28 +- milstd2525/icons/war/shgpusmdt------.svg | 28 +- milstd2525/icons/war/shgpusmm-------.svg | 28 +- milstd2525/icons/war/shgpusmmc------.svg | 28 +- milstd2525/icons/war/shgpusmmt------.svg | 28 +- milstd2525/icons/war/shgpusmp-------.svg | 28 +- milstd2525/icons/war/shgpusmpc------.svg | 28 +- milstd2525/icons/war/shgpusmpt------.svg | 28 +- milstd2525/icons/war/shgpusmt-------.svg | 28 +- milstd2525/icons/war/shgpusmv-------.svg | 28 +- milstd2525/icons/war/shgpusmvc------.svg | 28 +- milstd2525/icons/war/shgpusmvt------.svg | 28 +- milstd2525/icons/war/shgpuss--------.svg | 28 +- milstd2525/icons/war/shgpuss1-------.svg | 28 +- milstd2525/icons/war/shgpuss1c------.svg | 28 +- milstd2525/icons/war/shgpuss1t------.svg | 28 +- milstd2525/icons/war/shgpuss2-------.svg | 28 +- milstd2525/icons/war/shgpuss2c------.svg | 28 +- milstd2525/icons/war/shgpuss2t------.svg | 28 +- milstd2525/icons/war/shgpuss3-------.svg | 28 +- milstd2525/icons/war/shgpuss3a------.svg | 28 +- milstd2525/icons/war/shgpuss3ac-----.svg | 28 +- milstd2525/icons/war/shgpuss3at-----.svg | 28 +- milstd2525/icons/war/shgpuss3c------.svg | 28 +- milstd2525/icons/war/shgpuss3t------.svg | 28 +- milstd2525/icons/war/shgpuss4-------.svg | 28 +- milstd2525/icons/war/shgpuss4c------.svg | 28 +- milstd2525/icons/war/shgpuss4t------.svg | 28 +- milstd2525/icons/war/shgpuss5-------.svg | 28 +- milstd2525/icons/war/shgpuss5c------.svg | 28 +- milstd2525/icons/war/shgpuss5t------.svg | 28 +- milstd2525/icons/war/shgpuss6-------.svg | 28 +- milstd2525/icons/war/shgpuss6c------.svg | 28 +- milstd2525/icons/war/shgpuss6t------.svg | 28 +- milstd2525/icons/war/shgpuss7-------.svg | 28 +- milstd2525/icons/war/shgpuss7c------.svg | 28 +- milstd2525/icons/war/shgpuss7t------.svg | 28 +- milstd2525/icons/war/shgpuss8-------.svg | 28 +- milstd2525/icons/war/shgpuss8c------.svg | 28 +- milstd2525/icons/war/shgpuss8t------.svg | 28 +- milstd2525/icons/war/shgpuss9-------.svg | 28 +- milstd2525/icons/war/shgpuss9c------.svg | 28 +- milstd2525/icons/war/shgpuss9t------.svg | 28 +- milstd2525/icons/war/shgpussc-------.svg | 28 +- milstd2525/icons/war/shgpussl-------.svg | 28 +- milstd2525/icons/war/shgpusslc------.svg | 28 +- milstd2525/icons/war/shgpusslt------.svg | 28 +- milstd2525/icons/war/shgpusst-------.svg | 28 +- milstd2525/icons/war/shgpussw-------.svg | 28 +- milstd2525/icons/war/shgpusswc------.svg | 28 +- milstd2525/icons/war/shgpusswp------.svg | 28 +- milstd2525/icons/war/shgpusswpc-----.svg | 28 +- milstd2525/icons/war/shgpusswpt-----.svg | 28 +- milstd2525/icons/war/shgpusswt------.svg | 28 +- milstd2525/icons/war/shgpussx-------.svg | 28 +- milstd2525/icons/war/shgpussxc------.svg | 28 +- milstd2525/icons/war/shgpussxt------.svg | 28 +- milstd2525/icons/war/shgpust--------.svg | 28 +- milstd2525/icons/war/shgpusta-------.svg | 28 +- milstd2525/icons/war/shgpustac------.svg | 28 +- milstd2525/icons/war/shgpustat------.svg | 28 +- milstd2525/icons/war/shgpustc-------.svg | 28 +- milstd2525/icons/war/shgpusti-------.svg | 28 +- milstd2525/icons/war/shgpustic------.svg | 28 +- milstd2525/icons/war/shgpustit------.svg | 28 +- milstd2525/icons/war/shgpustm-------.svg | 28 +- milstd2525/icons/war/shgpustmc------.svg | 28 +- milstd2525/icons/war/shgpustmt------.svg | 28 +- milstd2525/icons/war/shgpustr-------.svg | 28 +- milstd2525/icons/war/shgpustrc------.svg | 28 +- milstd2525/icons/war/shgpustrt------.svg | 28 +- milstd2525/icons/war/shgpusts-------.svg | 28 +- milstd2525/icons/war/shgpustsc------.svg | 28 +- milstd2525/icons/war/shgpustst------.svg | 28 +- milstd2525/icons/war/shgpustt-------.svg | 28 +- milstd2525/icons/war/shgpusx--------.svg | 28 +- milstd2525/icons/war/shgpusxc-------.svg | 28 +- milstd2525/icons/war/shgpusxe-------.svg | 28 +- milstd2525/icons/war/shgpusxec------.svg | 28 +- milstd2525/icons/war/shgpusxet------.svg | 28 +- milstd2525/icons/war/shgpusxh-------.svg | 28 +- milstd2525/icons/war/shgpusxhc------.svg | 28 +- milstd2525/icons/war/shgpusxht------.svg | 28 +- milstd2525/icons/war/shgpusxo-------.svg | 28 +- milstd2525/icons/war/shgpusxoc------.svg | 28 +- milstd2525/icons/war/shgpusxom------.svg | 28 +- milstd2525/icons/war/shgpusxomc-----.svg | 28 +- milstd2525/icons/war/shgpusxomt-----.svg | 28 +- milstd2525/icons/war/shgpusxot------.svg | 28 +- milstd2525/icons/war/shgpusxr-------.svg | 28 +- milstd2525/icons/war/shgpusxrc------.svg | 28 +- milstd2525/icons/war/shgpusxrt------.svg | 28 +- milstd2525/icons/war/shgpusxt-------.svg | 28 +- milstd2525/icons/war/shgpuu---------.svg | 28 +- milstd2525/icons/war/shgpuua--------.svg | 28 +- milstd2525/icons/war/shgpuuab-------.svg | 28 +- milstd2525/icons/war/shgpuuabr------.svg | 28 +- milstd2525/icons/war/shgpuuac-------.svg | 28 +- milstd2525/icons/war/shgpuuacc------.svg | 28 +- milstd2525/icons/war/shgpuuacck-----.svg | 28 +- milstd2525/icons/war/shgpuuaccm-----.svg | 28 +- milstd2525/icons/war/shgpuuacr------.svg | 28 +- milstd2525/icons/war/shgpuuacrs-----.svg | 28 +- milstd2525/icons/war/shgpuuacrw-----.svg | 28 +- milstd2525/icons/war/shgpuuacs------.svg | 28 +- milstd2525/icons/war/shgpuuacsa-----.svg | 28 +- milstd2525/icons/war/shgpuuacsm-----.svg | 28 +- milstd2525/icons/war/shgpuuad-------.svg | 28 +- milstd2525/icons/war/shgpuuan-------.svg | 28 +- milstd2525/icons/war/shgpuue--------.svg | 28 +- milstd2525/icons/war/shgpuui--------.svg | 28 +- milstd2525/icons/war/shgpuul--------.svg | 28 +- milstd2525/icons/war/shgpuulc-------.svg | 28 +- milstd2525/icons/war/shgpuuld-------.svg | 28 +- milstd2525/icons/war/shgpuulf-------.svg | 28 +- milstd2525/icons/war/shgpuulm-------.svg | 28 +- milstd2525/icons/war/shgpuuls-------.svg | 28 +- milstd2525/icons/war/shgpuum--------.svg | 28 +- milstd2525/icons/war/shgpuuma-------.svg | 28 +- milstd2525/icons/war/shgpuumc-------.svg | 28 +- milstd2525/icons/war/shgpuumj-------.svg | 28 +- milstd2525/icons/war/shgpuummo------.svg | 28 +- milstd2525/icons/war/shgpuumo-------.svg | 28 +- milstd2525/icons/war/shgpuumq-------.svg | 28 +- milstd2525/icons/war/shgpuumr-------.svg | 28 +- milstd2525/icons/war/shgpuumrg------.svg | 28 +- milstd2525/icons/war/shgpuumrs------.svg | 28 +- milstd2525/icons/war/shgpuumrss-----.svg | 28 +- milstd2525/icons/war/shgpuumrx------.svg | 28 +- milstd2525/icons/war/shgpuums-------.svg | 28 +- milstd2525/icons/war/shgpuumse------.svg | 28 +- milstd2525/icons/war/shgpuumsea-----.svg | 28 +- milstd2525/icons/war/shgpuumsec-----.svg | 28 +- milstd2525/icons/war/shgpuumsed-----.svg | 28 +- milstd2525/icons/war/shgpuumsei-----.svg | 28 +- milstd2525/icons/war/shgpuumsej-----.svg | 28 +- milstd2525/icons/war/shgpuumset-----.svg | 28 +- milstd2525/icons/war/shgpuumt-------.svg | 28 +- milstd2525/icons/war/shgpuup--------.svg | 28 +- milstd2525/icons/war/shgpuus--------.svg | 28 +- milstd2525/icons/war/shgpuusa-------.svg | 28 +- milstd2525/icons/war/shgpuusc-------.svg | 28 +- milstd2525/icons/war/shgpuuscl------.svg | 28 +- milstd2525/icons/war/shgpuusf-------.svg | 28 +- milstd2525/icons/war/shgpuusm-------.svg | 28 +- milstd2525/icons/war/shgpuusml------.svg | 28 +- milstd2525/icons/war/shgpuusmn------.svg | 28 +- milstd2525/icons/war/shgpuusms------.svg | 28 +- milstd2525/icons/war/shgpuuso-------.svg | 28 +- milstd2525/icons/war/shgpuusr-------.svg | 28 +- milstd2525/icons/war/shgpuusrs------.svg | 28 +- milstd2525/icons/war/shgpuusrt------.svg | 28 +- milstd2525/icons/war/shgpuusrw------.svg | 28 +- milstd2525/icons/war/shgpuuss-------.svg | 28 +- milstd2525/icons/war/shgpuusw-------.svg | 28 +- milstd2525/icons/war/shgpuusx-------.svg | 28 +- milstd2525/icons/war/shpa-----------.svg | 28 +- milstd2525/icons/war/shpal----------.svg | 28 +- milstd2525/icons/war/shpas----------.svg | 28 +- milstd2525/icons/war/shpat----------.svg | 28 +- milstd2525/icons/war/shpav----------.svg | 28 +- milstd2525/icons/war/shpp-----------.svg | 28 +- milstd2525/icons/war/shppl----------.svg | 28 +- milstd2525/icons/war/shpps----------.svg | 28 +- milstd2525/icons/war/shppt----------.svg | 28 +- milstd2525/icons/war/shppv----------.svg | 28 +- milstd2525/icons/war/shsa-----------.svg | 28 +- milstd2525/icons/war/shsac----------.svg | 28 +- milstd2525/icons/war/shsaca---------.svg | 28 +- milstd2525/icons/war/shsacala-------.svg | 28 +- milstd2525/icons/war/shsacalc-------.svg | 28 +- milstd2525/icons/war/shsacals-------.svg | 28 +- milstd2525/icons/war/shsacalsm------.svg | 28 +- milstd2525/icons/war/shsacalst------.svg | 28 +- milstd2525/icons/war/shsacd---------.svg | 28 +- milstd2525/icons/war/shsach---------.svg | 28 +- milstd2525/icons/war/shsacl---------.svg | 28 +- milstd2525/icons/war/shsaclbb-------.svg | 28 +- milstd2525/icons/war/shsaclcc-------.svg | 28 +- milstd2525/icons/war/shsaclcv-------.svg | 28 +- milstd2525/icons/war/shsacldd-------.svg | 28 +- milstd2525/icons/war/shsaclff-------.svg | 28 +- milstd2525/icons/war/shsaclll-------.svg | 28 +- milstd2525/icons/war/shsaclllas-----.svg | 28 +- milstd2525/icons/war/shsaclllmi-----.svg | 28 +- milstd2525/icons/war/shsaclllsu-----.svg | 28 +- milstd2525/icons/war/shsacm---------.svg | 28 +- milstd2525/icons/war/shsacmma-------.svg | 28 +- milstd2525/icons/war/shsacmmh-------.svg | 28 +- milstd2525/icons/war/shsacmml-------.svg | 28 +- milstd2525/icons/war/shsacmms-------.svg | 28 +- milstd2525/icons/war/shsacp---------.svg | 28 +- milstd2525/icons/war/shsacpsb-------.svg | 28 +- milstd2525/icons/war/shsacpsu-------.svg | 28 +- milstd2525/icons/war/shsacpsug------.svg | 28 +- milstd2525/icons/war/shsacpsum------.svg | 28 +- milstd2525/icons/war/shsacpsut------.svg | 28 +- milstd2525/icons/war/shsacu---------.svg | 28 +- milstd2525/icons/war/shsacum--------.svg | 28 +- milstd2525/icons/war/shsacun--------.svg | 28 +- milstd2525/icons/war/shsacur--------.svg | 28 +- milstd2525/icons/war/shsacus--------.svg | 28 +- milstd2525/icons/war/shsag----------.svg | 28 +- milstd2525/icons/war/shsagc---------.svg | 28 +- milstd2525/icons/war/shsagg---------.svg | 28 +- milstd2525/icons/war/shsagt---------.svg | 28 +- milstd2525/icons/war/shsagu---------.svg | 28 +- milstd2525/icons/war/shsan----------.svg | 28 +- milstd2525/icons/war/shsanf---------.svg | 28 +- milstd2525/icons/war/shsanh---------.svg | 28 +- milstd2525/icons/war/shsani---------.svg | 28 +- milstd2525/icons/war/shsanm---------.svg | 28 +- milstd2525/icons/war/shsanr---------.svg | 28 +- milstd2525/icons/war/shsans---------.svg | 28 +- milstd2525/icons/war/shsao----------.svg | 28 +- milstd2525/icons/war/shsaxa---------.svg | 28 +- milstd2525/icons/war/shsaxar--------.svg | 28 +- milstd2525/icons/war/shsaxas--------.svg | 28 +- milstd2525/icons/war/shsaxf---------.svg | 28 +- milstd2525/icons/war/shsaxfdf-------.svg | 28 +- milstd2525/icons/war/shsaxfdr-------.svg | 28 +- milstd2525/icons/war/shsaxftr-------.svg | 28 +- milstd2525/icons/war/shsaxh---------.svg | 28 +- milstd2525/icons/war/shsaxl---------.svg | 28 +- milstd2525/icons/war/shsaxm---------.svg | 28 +- milstd2525/icons/war/shsaxmc--------.svg | 28 +- milstd2525/icons/war/shsaxmf--------.svg | 28 +- milstd2525/icons/war/shsaxmh--------.svg | 28 +- milstd2525/icons/war/shsaxmo--------.svg | 28 +- milstd2525/icons/war/shsaxmp--------.svg | 28 +- milstd2525/icons/war/shsaxmr--------.svg | 28 +- milstd2525/icons/war/shsaxmto-------.svg | 28 +- milstd2525/icons/war/shsaxmtu-------.svg | 28 +- milstd2525/icons/war/shsaxp---------.svg | 28 +- milstd2525/icons/war/shsaxr---------.svg | 28 +- milstd2525/icons/war/shsp-----------.svg | 28 +- milstd2525/icons/war/shspc----------.svg | 28 +- milstd2525/icons/war/shspca---------.svg | 28 +- milstd2525/icons/war/shspcala-------.svg | 28 +- milstd2525/icons/war/shspcalc-------.svg | 28 +- milstd2525/icons/war/shspcals-------.svg | 28 +- milstd2525/icons/war/shspcalsm------.svg | 28 +- milstd2525/icons/war/shspcalst------.svg | 28 +- milstd2525/icons/war/shspcd---------.svg | 28 +- milstd2525/icons/war/shspch---------.svg | 28 +- milstd2525/icons/war/shspcl---------.svg | 28 +- milstd2525/icons/war/shspclbb-------.svg | 28 +- milstd2525/icons/war/shspclcc-------.svg | 28 +- milstd2525/icons/war/shspclcv-------.svg | 28 +- milstd2525/icons/war/shspcldd-------.svg | 28 +- milstd2525/icons/war/shspclff-------.svg | 28 +- milstd2525/icons/war/shspclll-------.svg | 28 +- milstd2525/icons/war/shspclllas-----.svg | 28 +- milstd2525/icons/war/shspclllmi-----.svg | 28 +- milstd2525/icons/war/shspclllsu-----.svg | 28 +- milstd2525/icons/war/shspcm---------.svg | 28 +- milstd2525/icons/war/shspcmma-------.svg | 28 +- milstd2525/icons/war/shspcmmh-------.svg | 28 +- milstd2525/icons/war/shspcmml-------.svg | 28 +- milstd2525/icons/war/shspcmms-------.svg | 28 +- milstd2525/icons/war/shspcp---------.svg | 28 +- milstd2525/icons/war/shspcpsb-------.svg | 28 +- milstd2525/icons/war/shspcpsu-------.svg | 28 +- milstd2525/icons/war/shspcpsug------.svg | 28 +- milstd2525/icons/war/shspcpsum------.svg | 28 +- milstd2525/icons/war/shspcpsut------.svg | 28 +- milstd2525/icons/war/shspcu---------.svg | 28 +- milstd2525/icons/war/shspcum--------.svg | 28 +- milstd2525/icons/war/shspcun--------.svg | 28 +- milstd2525/icons/war/shspcur--------.svg | 28 +- milstd2525/icons/war/shspcus--------.svg | 28 +- milstd2525/icons/war/shspg----------.svg | 28 +- milstd2525/icons/war/shspgc---------.svg | 28 +- milstd2525/icons/war/shspgg---------.svg | 28 +- milstd2525/icons/war/shspgt---------.svg | 28 +- milstd2525/icons/war/shspgu---------.svg | 28 +- milstd2525/icons/war/shspn----------.svg | 28 +- milstd2525/icons/war/shspnf---------.svg | 28 +- milstd2525/icons/war/shspnh---------.svg | 28 +- milstd2525/icons/war/shspni---------.svg | 28 +- milstd2525/icons/war/shspnm---------.svg | 28 +- milstd2525/icons/war/shspnr---------.svg | 28 +- milstd2525/icons/war/shspns---------.svg | 28 +- milstd2525/icons/war/shspo----------.svg | 28 +- milstd2525/icons/war/shspxa---------.svg | 28 +- milstd2525/icons/war/shspxar--------.svg | 28 +- milstd2525/icons/war/shspxas--------.svg | 28 +- milstd2525/icons/war/shspxf---------.svg | 28 +- milstd2525/icons/war/shspxfdf-------.svg | 28 +- milstd2525/icons/war/shspxfdr-------.svg | 28 +- milstd2525/icons/war/shspxftr-------.svg | 28 +- milstd2525/icons/war/shspxh---------.svg | 28 +- milstd2525/icons/war/shspxl---------.svg | 28 +- milstd2525/icons/war/shspxm---------.svg | 28 +- milstd2525/icons/war/shspxmc--------.svg | 28 +- milstd2525/icons/war/shspxmf--------.svg | 28 +- milstd2525/icons/war/shspxmh--------.svg | 28 +- milstd2525/icons/war/shspxmo--------.svg | 28 +- milstd2525/icons/war/shspxmp--------.svg | 28 +- milstd2525/icons/war/shspxmr--------.svg | 28 +- milstd2525/icons/war/shspxmto-------.svg | 28 +- milstd2525/icons/war/shspxmtu-------.svg | 28 +- milstd2525/icons/war/shspxp---------.svg | 28 +- milstd2525/icons/war/shspxr---------.svg | 28 +- milstd2525/icons/war/shua-----------.svg | 28 +- milstd2525/icons/war/shuae----------.svg | 28 +- milstd2525/icons/war/shuand---------.svg | 28 +- milstd2525/icons/war/shuas----------.svg | 28 +- milstd2525/icons/war/shuas1---------.svg | 28 +- milstd2525/icons/war/shuas2---------.svg | 28 +- milstd2525/icons/war/shuas3---------.svg | 28 +- milstd2525/icons/war/shuas4---------.svg | 28 +- milstd2525/icons/war/shuasb---------.svg | 28 +- milstd2525/icons/war/shuasc---------.svg | 28 +- milstd2525/icons/war/shuasca--------.svg | 28 +- milstd2525/icons/war/shuascb--------.svg | 28 +- milstd2525/icons/war/shuascf--------.svg | 28 +- milstd2525/icons/war/shuascg--------.svg | 28 +- milstd2525/icons/war/shuascm--------.svg | 28 +- milstd2525/icons/war/shuasf---------.svg | 28 +- milstd2525/icons/war/shuask---------.svg | 28 +- milstd2525/icons/war/shuasl---------.svg | 28 +- milstd2525/icons/war/shuasn---------.svg | 28 +- milstd2525/icons/war/shuasna--------.svg | 28 +- milstd2525/icons/war/shuasnb--------.svg | 28 +- milstd2525/icons/war/shuasnf--------.svg | 28 +- milstd2525/icons/war/shuasng--------.svg | 28 +- milstd2525/icons/war/shuasnm--------.svg | 28 +- milstd2525/icons/war/shuaso---------.svg | 28 +- milstd2525/icons/war/shuasof--------.svg | 28 +- milstd2525/icons/war/shuasr---------.svg | 28 +- milstd2525/icons/war/shuasu---------.svg | 28 +- milstd2525/icons/war/shuasum--------.svg | 28 +- milstd2525/icons/war/shuasun--------.svg | 28 +- milstd2525/icons/war/shuasus--------.svg | 28 +- milstd2525/icons/war/shuasx---------.svg | 28 +- milstd2525/icons/war/shuav----------.svg | 28 +- milstd2525/icons/war/shuaw----------.svg | 28 +- milstd2525/icons/war/shuawd---------.svg | 28 +- milstd2525/icons/war/shuawdm--------.svg | 28 +- milstd2525/icons/war/shuawdmg-------.svg | 28 +- milstd2525/icons/war/shuawdmm-------.svg | 28 +- milstd2525/icons/war/shuawm---------.svg | 28 +- milstd2525/icons/war/shuawma--------.svg | 28 +- milstd2525/icons/war/shuawmb--------.svg | 28 +- milstd2525/icons/war/shuawmbd-------.svg | 28 +- milstd2525/icons/war/shuawmc--------.svg | 28 +- milstd2525/icons/war/shuawmd--------.svg | 28 +- milstd2525/icons/war/shuawme--------.svg | 28 +- milstd2525/icons/war/shuawmf--------.svg | 28 +- milstd2525/icons/war/shuawmfc-------.svg | 28 +- milstd2525/icons/war/shuawmfd-------.svg | 28 +- milstd2525/icons/war/shuawmfe-------.svg | 28 +- milstd2525/icons/war/shuawmfo-------.svg | 28 +- milstd2525/icons/war/shuawmfr-------.svg | 28 +- milstd2525/icons/war/shuawmfx-------.svg | 28 +- milstd2525/icons/war/shuawmg--------.svg | 28 +- milstd2525/icons/war/shuawmgc-------.svg | 28 +- milstd2525/icons/war/shuawmgd-------.svg | 28 +- milstd2525/icons/war/shuawmge-------.svg | 28 +- milstd2525/icons/war/shuawmgo-------.svg | 28 +- milstd2525/icons/war/shuawmgr-------.svg | 28 +- milstd2525/icons/war/shuawmgx-------.svg | 28 +- milstd2525/icons/war/shuawmm--------.svg | 28 +- milstd2525/icons/war/shuawmmc-------.svg | 28 +- milstd2525/icons/war/shuawmmd-------.svg | 28 +- milstd2525/icons/war/shuawmme-------.svg | 28 +- milstd2525/icons/war/shuawmmo-------.svg | 28 +- milstd2525/icons/war/shuawmmr-------.svg | 28 +- milstd2525/icons/war/shuawmmx-------.svg | 28 +- milstd2525/icons/war/shuawmn--------.svg | 28 +- milstd2525/icons/war/shuawmo--------.svg | 28 +- milstd2525/icons/war/shuawmod-------.svg | 28 +- milstd2525/icons/war/shuawmr--------.svg | 28 +- milstd2525/icons/war/shuawms--------.svg | 28 +- milstd2525/icons/war/shuawmsd-------.svg | 28 +- milstd2525/icons/war/shuawmsx-------.svg | 28 +- milstd2525/icons/war/shuawmx--------.svg | 28 +- milstd2525/icons/war/shuawt---------.svg | 28 +- milstd2525/icons/war/shuax----------.svg | 28 +- milstd2525/icons/war/shup-----------.svg | 28 +- milstd2525/icons/war/shupe----------.svg | 28 +- milstd2525/icons/war/shupnd---------.svg | 28 +- milstd2525/icons/war/shups----------.svg | 28 +- milstd2525/icons/war/shups1---------.svg | 28 +- milstd2525/icons/war/shups2---------.svg | 28 +- milstd2525/icons/war/shups3---------.svg | 28 +- milstd2525/icons/war/shups4---------.svg | 28 +- milstd2525/icons/war/shupsb---------.svg | 28 +- milstd2525/icons/war/shupsc---------.svg | 28 +- milstd2525/icons/war/shupsca--------.svg | 28 +- milstd2525/icons/war/shupscb--------.svg | 28 +- milstd2525/icons/war/shupscf--------.svg | 28 +- milstd2525/icons/war/shupscg--------.svg | 28 +- milstd2525/icons/war/shupscm--------.svg | 28 +- milstd2525/icons/war/shupsf---------.svg | 28 +- milstd2525/icons/war/shupsk---------.svg | 28 +- milstd2525/icons/war/shupsl---------.svg | 28 +- milstd2525/icons/war/shupsn---------.svg | 28 +- milstd2525/icons/war/shupsna--------.svg | 28 +- milstd2525/icons/war/shupsnb--------.svg | 28 +- milstd2525/icons/war/shupsnf--------.svg | 28 +- milstd2525/icons/war/shupsng--------.svg | 28 +- milstd2525/icons/war/shupsnm--------.svg | 28 +- milstd2525/icons/war/shupso---------.svg | 28 +- milstd2525/icons/war/shupsof--------.svg | 28 +- milstd2525/icons/war/shupsr---------.svg | 28 +- milstd2525/icons/war/shupsu---------.svg | 28 +- milstd2525/icons/war/shupsum--------.svg | 28 +- milstd2525/icons/war/shupsun--------.svg | 28 +- milstd2525/icons/war/shupsus--------.svg | 28 +- milstd2525/icons/war/shupsx---------.svg | 28 +- milstd2525/icons/war/shupv----------.svg | 28 +- milstd2525/icons/war/shupw----------.svg | 28 +- milstd2525/icons/war/shupwd---------.svg | 28 +- milstd2525/icons/war/shupwdm--------.svg | 28 +- milstd2525/icons/war/shupwdmg-------.svg | 28 +- milstd2525/icons/war/shupwdmm-------.svg | 28 +- milstd2525/icons/war/shupwm---------.svg | 28 +- milstd2525/icons/war/shupwma--------.svg | 28 +- milstd2525/icons/war/shupwmb--------.svg | 28 +- milstd2525/icons/war/shupwmbd-------.svg | 28 +- milstd2525/icons/war/shupwmc--------.svg | 28 +- milstd2525/icons/war/shupwmd--------.svg | 28 +- milstd2525/icons/war/shupwme--------.svg | 28 +- milstd2525/icons/war/shupwmf--------.svg | 28 +- milstd2525/icons/war/shupwmfc-------.svg | 28 +- milstd2525/icons/war/shupwmfd-------.svg | 28 +- milstd2525/icons/war/shupwmfe-------.svg | 28 +- milstd2525/icons/war/shupwmfo-------.svg | 28 +- milstd2525/icons/war/shupwmfr-------.svg | 28 +- milstd2525/icons/war/shupwmfx-------.svg | 28 +- milstd2525/icons/war/shupwmg--------.svg | 28 +- milstd2525/icons/war/shupwmgc-------.svg | 28 +- milstd2525/icons/war/shupwmgd-------.svg | 28 +- milstd2525/icons/war/shupwmge-------.svg | 28 +- milstd2525/icons/war/shupwmgo-------.svg | 28 +- milstd2525/icons/war/shupwmgr-------.svg | 28 +- milstd2525/icons/war/shupwmgx-------.svg | 28 +- milstd2525/icons/war/shupwmm--------.svg | 28 +- milstd2525/icons/war/shupwmmc-------.svg | 28 +- milstd2525/icons/war/shupwmmd-------.svg | 28 +- milstd2525/icons/war/shupwmme-------.svg | 28 +- milstd2525/icons/war/shupwmmo-------.svg | 28 +- milstd2525/icons/war/shupwmmr-------.svg | 28 +- milstd2525/icons/war/shupwmmx-------.svg | 28 +- milstd2525/icons/war/shupwmn--------.svg | 28 +- milstd2525/icons/war/shupwmo--------.svg | 28 +- milstd2525/icons/war/shupwmod-------.svg | 28 +- milstd2525/icons/war/shupwmr--------.svg | 28 +- milstd2525/icons/war/shupwms--------.svg | 28 +- milstd2525/icons/war/shupwmsd-------.svg | 28 +- milstd2525/icons/war/shupwmsx-------.svg | 28 +- milstd2525/icons/war/shupwmx--------.svg | 28 +- milstd2525/icons/war/shupwt---------.svg | 28 +- milstd2525/icons/war/shupx----------.svg | 28 +- milstd2525/icons/war/snaa-----------.svg | 28 +- milstd2525/icons/war/snaac----------.svg | 28 +- milstd2525/icons/war/snaacf---------.svg | 28 +- milstd2525/icons/war/snaach---------.svg | 28 +- milstd2525/icons/war/snaacl---------.svg | 28 +- milstd2525/icons/war/snaam----------.svg | 28 +- milstd2525/icons/war/snaame---------.svg | 28 +- milstd2525/icons/war/snaamf---------.svg | 28 +- milstd2525/icons/war/snaamfa--------.svg | 28 +- milstd2525/icons/war/snaamfb--------.svg | 28 +- milstd2525/icons/war/snaamfc--------.svg | 28 +- milstd2525/icons/war/snaamfch-------.svg | 28 +- milstd2525/icons/war/snaamfcl-------.svg | 28 +- milstd2525/icons/war/snaamfcm-------.svg | 28 +- milstd2525/icons/war/snaamfd--------.svg | 28 +- milstd2525/icons/war/snaamff--------.svg | 28 +- milstd2525/icons/war/snaamffi-------.svg | 28 +- milstd2525/icons/war/snaamfh--------.svg | 28 +- milstd2525/icons/war/snaamfj--------.svg | 28 +- milstd2525/icons/war/snaamfk--------.svg | 28 +- milstd2525/icons/war/snaamfkb-------.svg | 28 +- milstd2525/icons/war/snaamfkd-------.svg | 28 +- milstd2525/icons/war/snaamfl--------.svg | 28 +- milstd2525/icons/war/snaamfm--------.svg | 28 +- milstd2525/icons/war/snaamfo--------.svg | 28 +- milstd2525/icons/war/snaamfp--------.svg | 28 +- milstd2525/icons/war/snaamfpm-------.svg | 28 +- milstd2525/icons/war/snaamfpn-------.svg | 28 +- milstd2525/icons/war/snaamfq--------.svg | 28 +- milstd2525/icons/war/snaamfqa-------.svg | 28 +- milstd2525/icons/war/snaamfqb-------.svg | 28 +- milstd2525/icons/war/snaamfqc-------.svg | 28 +- milstd2525/icons/war/snaamfqd-------.svg | 28 +- milstd2525/icons/war/snaamfqf-------.svg | 28 +- milstd2525/icons/war/snaamfqh-------.svg | 28 +- milstd2525/icons/war/snaamfqi-------.svg | 28 +- milstd2525/icons/war/snaamfqj-------.svg | 28 +- milstd2525/icons/war/snaamfqk-------.svg | 28 +- milstd2525/icons/war/snaamfql-------.svg | 28 +- milstd2525/icons/war/snaamfqm-------.svg | 28 +- milstd2525/icons/war/snaamfqn-------.svg | 28 +- milstd2525/icons/war/snaamfqo-------.svg | 28 +- milstd2525/icons/war/snaamfqp-------.svg | 28 +- milstd2525/icons/war/snaamfqr-------.svg | 28 +- milstd2525/icons/war/snaamfqrw------.svg | 28 +- milstd2525/icons/war/snaamfqrx------.svg | 28 +- milstd2525/icons/war/snaamfqrz------.svg | 28 +- milstd2525/icons/war/snaamfqs-------.svg | 28 +- milstd2525/icons/war/snaamfqt-------.svg | 28 +- milstd2525/icons/war/snaamfqu-------.svg | 28 +- milstd2525/icons/war/snaamfqy-------.svg | 28 +- milstd2525/icons/war/snaamfr--------.svg | 28 +- milstd2525/icons/war/snaamfrw-------.svg | 28 +- milstd2525/icons/war/snaamfrx-------.svg | 28 +- milstd2525/icons/war/snaamfrz-------.svg | 28 +- milstd2525/icons/war/snaamfs--------.svg | 28 +- milstd2525/icons/war/snaamft--------.svg | 28 +- milstd2525/icons/war/snaamfu--------.svg | 28 +- milstd2525/icons/war/snaamfuh-------.svg | 28 +- milstd2525/icons/war/snaamful-------.svg | 28 +- milstd2525/icons/war/snaamfum-------.svg | 28 +- milstd2525/icons/war/snaamfy--------.svg | 28 +- milstd2525/icons/war/snaamh---------.svg | 28 +- milstd2525/icons/war/snaamha--------.svg | 28 +- milstd2525/icons/war/snaamhc--------.svg | 28 +- milstd2525/icons/war/snaamhch-------.svg | 28 +- milstd2525/icons/war/snaamhcl-------.svg | 28 +- milstd2525/icons/war/snaamhcm-------.svg | 28 +- milstd2525/icons/war/snaamhd--------.svg | 28 +- milstd2525/icons/war/snaamhh--------.svg | 28 +- milstd2525/icons/war/snaamhi--------.svg | 28 +- milstd2525/icons/war/snaamhj--------.svg | 28 +- milstd2525/icons/war/snaamhk--------.svg | 28 +- milstd2525/icons/war/snaamhm--------.svg | 28 +- milstd2525/icons/war/snaamho--------.svg | 28 +- milstd2525/icons/war/snaamhq--------.svg | 28 +- milstd2525/icons/war/snaamhr--------.svg | 28 +- milstd2525/icons/war/snaamhs--------.svg | 28 +- milstd2525/icons/war/snaamht--------.svg | 28 +- milstd2525/icons/war/snaamhu--------.svg | 28 +- milstd2525/icons/war/snaamhuh-------.svg | 28 +- milstd2525/icons/war/snaamhul-------.svg | 28 +- milstd2525/icons/war/snaamhum-------.svg | 28 +- milstd2525/icons/war/snaaml---------.svg | 28 +- milstd2525/icons/war/snaamv---------.svg | 28 +- milstd2525/icons/war/snaaw----------.svg | 28 +- milstd2525/icons/war/snaawb---------.svg | 28 +- milstd2525/icons/war/snaawd---------.svg | 28 +- milstd2525/icons/war/snaawm---------.svg | 28 +- milstd2525/icons/war/snaawma--------.svg | 28 +- milstd2525/icons/war/snaawmaa-------.svg | 28 +- milstd2525/icons/war/snaawmap-------.svg | 28 +- milstd2525/icons/war/snaawmas-------.svg | 28 +- milstd2525/icons/war/snaawmb--------.svg | 28 +- milstd2525/icons/war/snaawmcm-------.svg | 28 +- milstd2525/icons/war/snaawms--------.svg | 28 +- milstd2525/icons/war/snaawmsa-------.svg | 28 +- milstd2525/icons/war/snaawmsb-------.svg | 28 +- milstd2525/icons/war/snaawmss-------.svg | 28 +- milstd2525/icons/war/snaawmsu-------.svg | 28 +- milstd2525/icons/war/snaawmu--------.svg | 28 +- milstd2525/icons/war/snap-----------.svg | 28 +- milstd2525/icons/war/snapc----------.svg | 28 +- milstd2525/icons/war/snapcf---------.svg | 28 +- milstd2525/icons/war/snapch---------.svg | 28 +- milstd2525/icons/war/snapcl---------.svg | 28 +- milstd2525/icons/war/snapm----------.svg | 28 +- milstd2525/icons/war/snapme---------.svg | 28 +- milstd2525/icons/war/snapmf---------.svg | 28 +- milstd2525/icons/war/snapmfa--------.svg | 28 +- milstd2525/icons/war/snapmfb--------.svg | 28 +- milstd2525/icons/war/snapmfc--------.svg | 28 +- milstd2525/icons/war/snapmfch-------.svg | 28 +- milstd2525/icons/war/snapmfcl-------.svg | 28 +- milstd2525/icons/war/snapmfcm-------.svg | 28 +- milstd2525/icons/war/snapmfd--------.svg | 28 +- milstd2525/icons/war/snapmff--------.svg | 28 +- milstd2525/icons/war/snapmffi-------.svg | 28 +- milstd2525/icons/war/snapmfh--------.svg | 28 +- milstd2525/icons/war/snapmfj--------.svg | 28 +- milstd2525/icons/war/snapmfk--------.svg | 28 +- milstd2525/icons/war/snapmfkb-------.svg | 28 +- milstd2525/icons/war/snapmfkd-------.svg | 28 +- milstd2525/icons/war/snapmfl--------.svg | 28 +- milstd2525/icons/war/snapmfm--------.svg | 28 +- milstd2525/icons/war/snapmfo--------.svg | 28 +- milstd2525/icons/war/snapmfp--------.svg | 28 +- milstd2525/icons/war/snapmfpm-------.svg | 28 +- milstd2525/icons/war/snapmfpn-------.svg | 28 +- milstd2525/icons/war/snapmfq--------.svg | 28 +- milstd2525/icons/war/snapmfqa-------.svg | 28 +- milstd2525/icons/war/snapmfqb-------.svg | 28 +- milstd2525/icons/war/snapmfqc-------.svg | 28 +- milstd2525/icons/war/snapmfqd-------.svg | 28 +- milstd2525/icons/war/snapmfqf-------.svg | 28 +- milstd2525/icons/war/snapmfqh-------.svg | 28 +- milstd2525/icons/war/snapmfqi-------.svg | 28 +- milstd2525/icons/war/snapmfqj-------.svg | 28 +- milstd2525/icons/war/snapmfqk-------.svg | 28 +- milstd2525/icons/war/snapmfql-------.svg | 28 +- milstd2525/icons/war/snapmfqm-------.svg | 28 +- milstd2525/icons/war/snapmfqn-------.svg | 28 +- milstd2525/icons/war/snapmfqo-------.svg | 28 +- milstd2525/icons/war/snapmfqp-------.svg | 28 +- milstd2525/icons/war/snapmfqr-------.svg | 28 +- milstd2525/icons/war/snapmfqrw------.svg | 28 +- milstd2525/icons/war/snapmfqrx------.svg | 28 +- milstd2525/icons/war/snapmfqrz------.svg | 28 +- milstd2525/icons/war/snapmfqs-------.svg | 28 +- milstd2525/icons/war/snapmfqt-------.svg | 28 +- milstd2525/icons/war/snapmfqu-------.svg | 28 +- milstd2525/icons/war/snapmfqy-------.svg | 28 +- milstd2525/icons/war/snapmfr--------.svg | 28 +- milstd2525/icons/war/snapmfrw-------.svg | 28 +- milstd2525/icons/war/snapmfrx-------.svg | 28 +- milstd2525/icons/war/snapmfrz-------.svg | 28 +- milstd2525/icons/war/snapmfs--------.svg | 28 +- milstd2525/icons/war/snapmft--------.svg | 28 +- milstd2525/icons/war/snapmfu--------.svg | 28 +- milstd2525/icons/war/snapmfuh-------.svg | 28 +- milstd2525/icons/war/snapmful-------.svg | 28 +- milstd2525/icons/war/snapmfum-------.svg | 28 +- milstd2525/icons/war/snapmfy--------.svg | 28 +- milstd2525/icons/war/snapmh---------.svg | 28 +- milstd2525/icons/war/snapmha--------.svg | 28 +- milstd2525/icons/war/snapmhc--------.svg | 28 +- milstd2525/icons/war/snapmhch-------.svg | 28 +- milstd2525/icons/war/snapmhcl-------.svg | 28 +- milstd2525/icons/war/snapmhcm-------.svg | 28 +- milstd2525/icons/war/snapmhd--------.svg | 28 +- milstd2525/icons/war/snapmhh--------.svg | 28 +- milstd2525/icons/war/snapmhi--------.svg | 28 +- milstd2525/icons/war/snapmhj--------.svg | 28 +- milstd2525/icons/war/snapmhk--------.svg | 28 +- milstd2525/icons/war/snapmhm--------.svg | 28 +- milstd2525/icons/war/snapmho--------.svg | 28 +- milstd2525/icons/war/snapmhq--------.svg | 28 +- milstd2525/icons/war/snapmhr--------.svg | 28 +- milstd2525/icons/war/snapmhs--------.svg | 28 +- milstd2525/icons/war/snapmht--------.svg | 28 +- milstd2525/icons/war/snapmhu--------.svg | 28 +- milstd2525/icons/war/snapmhuh-------.svg | 28 +- milstd2525/icons/war/snapmhul-------.svg | 28 +- milstd2525/icons/war/snapmhum-------.svg | 28 +- milstd2525/icons/war/snapml---------.svg | 28 +- milstd2525/icons/war/snapmv---------.svg | 28 +- milstd2525/icons/war/snapw----------.svg | 28 +- milstd2525/icons/war/snapwb---------.svg | 28 +- milstd2525/icons/war/snapwd---------.svg | 28 +- milstd2525/icons/war/snapwm---------.svg | 28 +- milstd2525/icons/war/snapwma--------.svg | 28 +- milstd2525/icons/war/snapwmaa-------.svg | 28 +- milstd2525/icons/war/snapwmap-------.svg | 28 +- milstd2525/icons/war/snapwmas-------.svg | 28 +- milstd2525/icons/war/snapwmb--------.svg | 28 +- milstd2525/icons/war/snapwmcm-------.svg | 28 +- milstd2525/icons/war/snapwms--------.svg | 28 +- milstd2525/icons/war/snapwmsa-------.svg | 28 +- milstd2525/icons/war/snapwmsb-------.svg | 28 +- milstd2525/icons/war/snapwmss-------.svg | 28 +- milstd2525/icons/war/snapwmsu-------.svg | 28 +- milstd2525/icons/war/snapwmu--------.svg | 28 +- milstd2525/icons/war/snfa-----------.svg | 28 +- milstd2525/icons/war/snfaa----------.svg | 28 +- milstd2525/icons/war/snfaaf---------.svg | 28 +- milstd2525/icons/war/snfaafa--------.svg | 28 +- milstd2525/icons/war/snfaafk--------.svg | 28 +- milstd2525/icons/war/snfaafu--------.svg | 28 +- milstd2525/icons/war/snfaafuh-------.svg | 28 +- milstd2525/icons/war/snfaaful-------.svg | 28 +- milstd2525/icons/war/snfaafum-------.svg | 28 +- milstd2525/icons/war/snfaah---------.svg | 28 +- milstd2525/icons/war/snfaaha--------.svg | 28 +- milstd2525/icons/war/snfaahh--------.svg | 28 +- milstd2525/icons/war/snfaahu--------.svg | 28 +- milstd2525/icons/war/snfaahuh-------.svg | 28 +- milstd2525/icons/war/snfaahul-------.svg | 28 +- milstd2525/icons/war/snfaahum-------.svg | 28 +- milstd2525/icons/war/snfaav---------.svg | 28 +- milstd2525/icons/war/snfab----------.svg | 28 +- milstd2525/icons/war/snfag----------.svg | 28 +- milstd2525/icons/war/snfagc---------.svg | 28 +- milstd2525/icons/war/snfagp---------.svg | 28 +- milstd2525/icons/war/snfagpa--------.svg | 28 +- milstd2525/icons/war/snfagr---------.svg | 28 +- milstd2525/icons/war/snfags---------.svg | 28 +- milstd2525/icons/war/snfan----------.svg | 28 +- milstd2525/icons/war/snfanb---------.svg | 28 +- milstd2525/icons/war/snfann---------.svg | 28 +- milstd2525/icons/war/snfans---------.svg | 28 +- milstd2525/icons/war/snfanu---------.svg | 28 +- milstd2525/icons/war/snfp-----------.svg | 28 +- milstd2525/icons/war/snfpa----------.svg | 28 +- milstd2525/icons/war/snfpaf---------.svg | 28 +- milstd2525/icons/war/snfpafa--------.svg | 28 +- milstd2525/icons/war/snfpafk--------.svg | 28 +- milstd2525/icons/war/snfpafu--------.svg | 28 +- milstd2525/icons/war/snfpafuh-------.svg | 28 +- milstd2525/icons/war/snfpaful-------.svg | 28 +- milstd2525/icons/war/snfpafum-------.svg | 28 +- milstd2525/icons/war/snfpah---------.svg | 28 +- milstd2525/icons/war/snfpaha--------.svg | 28 +- milstd2525/icons/war/snfpahh--------.svg | 28 +- milstd2525/icons/war/snfpahu--------.svg | 28 +- milstd2525/icons/war/snfpahuh-------.svg | 28 +- milstd2525/icons/war/snfpahul-------.svg | 28 +- milstd2525/icons/war/snfpahum-------.svg | 28 +- milstd2525/icons/war/snfpav---------.svg | 28 +- milstd2525/icons/war/snfpb----------.svg | 28 +- milstd2525/icons/war/snfpg----------.svg | 28 +- milstd2525/icons/war/snfpgc---------.svg | 28 +- milstd2525/icons/war/snfpgp---------.svg | 28 +- milstd2525/icons/war/snfpgpa--------.svg | 28 +- milstd2525/icons/war/snfpgr---------.svg | 28 +- milstd2525/icons/war/snfpgs---------.svg | 28 +- milstd2525/icons/war/snfpn----------.svg | 28 +- milstd2525/icons/war/snfpnb---------.svg | 28 +- milstd2525/icons/war/snfpnn---------.svg | 28 +- milstd2525/icons/war/snfpns---------.svg | 28 +- milstd2525/icons/war/snfpnu---------.svg | 28 +- milstd2525/icons/war/snga-----------.svg | 28 +- milstd2525/icons/war/sngae----------.svg | 28 +- milstd2525/icons/war/sngaes---------.svg | 28 +- milstd2525/icons/war/sngaese--------.svg | 28 +- milstd2525/icons/war/sngaesr--------.svg | 28 +- milstd2525/icons/war/sngaev---------.svg | 28 +- milstd2525/icons/war/sngaeva--------.svg | 28 +- milstd2525/icons/war/sngaevaa-------.svg | 28 +- milstd2525/icons/war/sngaevaar------.svg | 28 +- milstd2525/icons/war/sngaevac-------.svg | 28 +- milstd2525/icons/war/sngaevai-------.svg | 28 +- milstd2525/icons/war/sngaeval-------.svg | 28 +- milstd2525/icons/war/sngaevas-------.svg | 28 +- milstd2525/icons/war/sngaevat-------.svg | 28 +- milstd2525/icons/war/sngaevath------.svg | 28 +- milstd2525/icons/war/sngaevathr-----.svg | 28 +- milstd2525/icons/war/sngaevatl------.svg | 28 +- milstd2525/icons/war/sngaevatlr-----.svg | 28 +- milstd2525/icons/war/sngaevatm------.svg | 28 +- milstd2525/icons/war/sngaevatmr-----.svg | 28 +- milstd2525/icons/war/sngaevc--------.svg | 28 +- milstd2525/icons/war/sngaevca-------.svg | 28 +- milstd2525/icons/war/sngaevcah------.svg | 28 +- milstd2525/icons/war/sngaevcal------.svg | 28 +- milstd2525/icons/war/sngaevcam------.svg | 28 +- milstd2525/icons/war/sngaevcf-------.svg | 28 +- milstd2525/icons/war/sngaevcfh------.svg | 28 +- milstd2525/icons/war/sngaevcfl------.svg | 28 +- milstd2525/icons/war/sngaevcfm------.svg | 28 +- milstd2525/icons/war/sngaevcj-------.svg | 28 +- milstd2525/icons/war/sngaevcjh------.svg | 28 +- milstd2525/icons/war/sngaevcjl------.svg | 28 +- milstd2525/icons/war/sngaevcjm------.svg | 28 +- milstd2525/icons/war/sngaevcm-------.svg | 28 +- milstd2525/icons/war/sngaevcmh------.svg | 28 +- milstd2525/icons/war/sngaevcml------.svg | 28 +- milstd2525/icons/war/sngaevcmm------.svg | 28 +- milstd2525/icons/war/sngaevco-------.svg | 28 +- milstd2525/icons/war/sngaevcoh------.svg | 28 +- milstd2525/icons/war/sngaevcol------.svg | 28 +- milstd2525/icons/war/sngaevcom------.svg | 28 +- milstd2525/icons/war/sngaevct-------.svg | 28 +- milstd2525/icons/war/sngaevcth------.svg | 28 +- milstd2525/icons/war/sngaevctl------.svg | 28 +- milstd2525/icons/war/sngaevctm------.svg | 28 +- milstd2525/icons/war/sngaevcu-------.svg | 28 +- milstd2525/icons/war/sngaevcuh------.svg | 28 +- milstd2525/icons/war/sngaevcul------.svg | 28 +- milstd2525/icons/war/sngaevcum------.svg | 28 +- milstd2525/icons/war/sngaeve--------.svg | 28 +- milstd2525/icons/war/sngaevea-------.svg | 28 +- milstd2525/icons/war/sngaeveaa------.svg | 28 +- milstd2525/icons/war/sngaeveat------.svg | 28 +- milstd2525/icons/war/sngaeveb-------.svg | 28 +- milstd2525/icons/war/sngaevec-------.svg | 28 +- milstd2525/icons/war/sngaeved-------.svg | 28 +- milstd2525/icons/war/sngaeveda------.svg | 28 +- milstd2525/icons/war/sngaevee-------.svg | 28 +- milstd2525/icons/war/sngaevef-------.svg | 28 +- milstd2525/icons/war/sngaeveh-------.svg | 28 +- milstd2525/icons/war/sngaevem-------.svg | 28 +- milstd2525/icons/war/sngaeveml------.svg | 28 +- milstd2525/icons/war/sngaevemv------.svg | 28 +- milstd2525/icons/war/sngaever-------.svg | 28 +- milstd2525/icons/war/sngaeves-------.svg | 28 +- milstd2525/icons/war/sngaevm--------.svg | 28 +- milstd2525/icons/war/sngaevs--------.svg | 28 +- milstd2525/icons/war/sngaevsc-------.svg | 28 +- milstd2525/icons/war/sngaevsp-------.svg | 28 +- milstd2525/icons/war/sngaevsr-------.svg | 28 +- milstd2525/icons/war/sngaevst-------.svg | 28 +- milstd2525/icons/war/sngaevsw-------.svg | 28 +- milstd2525/icons/war/sngaevt--------.svg | 28 +- milstd2525/icons/war/sngaevu--------.svg | 28 +- milstd2525/icons/war/sngaevua-------.svg | 28 +- milstd2525/icons/war/sngaevuaa------.svg | 28 +- milstd2525/icons/war/sngaevub-------.svg | 28 +- milstd2525/icons/war/sngaevul-------.svg | 28 +- milstd2525/icons/war/sngaevur-------.svg | 28 +- milstd2525/icons/war/sngaevus-------.svg | 28 +- milstd2525/icons/war/sngaevush------.svg | 28 +- milstd2525/icons/war/sngaevusl------.svg | 28 +- milstd2525/icons/war/sngaevusm------.svg | 28 +- milstd2525/icons/war/sngaevut-------.svg | 28 +- milstd2525/icons/war/sngaevuth------.svg | 28 +- milstd2525/icons/war/sngaevutl------.svg | 28 +- milstd2525/icons/war/sngaevux-------.svg | 28 +- milstd2525/icons/war/sngaewa--------.svg | 28 +- milstd2525/icons/war/sngaewah-------.svg | 28 +- milstd2525/icons/war/sngaewal-------.svg | 28 +- milstd2525/icons/war/sngaewam-------.svg | 28 +- milstd2525/icons/war/sngaewd--------.svg | 28 +- milstd2525/icons/war/sngaewdh-------.svg | 28 +- milstd2525/icons/war/sngaewdhs------.svg | 28 +- milstd2525/icons/war/sngaewdl-------.svg | 28 +- milstd2525/icons/war/sngaewdls------.svg | 28 +- milstd2525/icons/war/sngaewdm-------.svg | 28 +- milstd2525/icons/war/sngaewdms------.svg | 28 +- milstd2525/icons/war/sngaewg--------.svg | 28 +- milstd2525/icons/war/sngaewgh-------.svg | 28 +- milstd2525/icons/war/sngaewgl-------.svg | 28 +- milstd2525/icons/war/sngaewgm-------.svg | 28 +- milstd2525/icons/war/sngaewgr-------.svg | 28 +- milstd2525/icons/war/sngaewh--------.svg | 28 +- milstd2525/icons/war/sngaewhh-------.svg | 28 +- milstd2525/icons/war/sngaewhhs------.svg | 28 +- milstd2525/icons/war/sngaewhl-------.svg | 28 +- milstd2525/icons/war/sngaewhls------.svg | 28 +- milstd2525/icons/war/sngaewhm-------.svg | 28 +- milstd2525/icons/war/sngaewhms------.svg | 28 +- milstd2525/icons/war/sngaewm--------.svg | 28 +- milstd2525/icons/war/sngaewma-------.svg | 28 +- milstd2525/icons/war/sngaewmai------.svg | 28 +- milstd2525/icons/war/sngaewmaie-----.svg | 28 +- milstd2525/icons/war/sngaewmair-----.svg | 28 +- milstd2525/icons/war/sngaewmal------.svg | 28 +- milstd2525/icons/war/sngaewmale-----.svg | 28 +- milstd2525/icons/war/sngaewmalr-----.svg | 28 +- milstd2525/icons/war/sngaewmas------.svg | 28 +- milstd2525/icons/war/sngaewmase-----.svg | 28 +- milstd2525/icons/war/sngaewmasr-----.svg | 28 +- milstd2525/icons/war/sngaewmat------.svg | 28 +- milstd2525/icons/war/sngaewmate-----.svg | 28 +- milstd2525/icons/war/sngaewmatr-----.svg | 28 +- milstd2525/icons/war/sngaewms-------.svg | 28 +- milstd2525/icons/war/sngaewmsi------.svg | 28 +- milstd2525/icons/war/sngaewmsl------.svg | 28 +- milstd2525/icons/war/sngaewmss------.svg | 28 +- milstd2525/icons/war/sngaewmt-------.svg | 28 +- milstd2525/icons/war/sngaewmth------.svg | 28 +- milstd2525/icons/war/sngaewmtl------.svg | 28 +- milstd2525/icons/war/sngaewmtm------.svg | 28 +- milstd2525/icons/war/sngaewo--------.svg | 28 +- milstd2525/icons/war/sngaewoh-------.svg | 28 +- milstd2525/icons/war/sngaewol-------.svg | 28 +- milstd2525/icons/war/sngaewom-------.svg | 28 +- milstd2525/icons/war/sngaewr--------.svg | 28 +- milstd2525/icons/war/sngaewrh-------.svg | 28 +- milstd2525/icons/war/sngaewrl-------.svg | 28 +- milstd2525/icons/war/sngaewrr-------.svg | 28 +- milstd2525/icons/war/sngaews--------.svg | 28 +- milstd2525/icons/war/sngaewsh-------.svg | 28 +- milstd2525/icons/war/sngaewsl-------.svg | 28 +- milstd2525/icons/war/sngaewsm-------.svg | 28 +- milstd2525/icons/war/sngaewt--------.svg | 28 +- milstd2525/icons/war/sngaewth-------.svg | 28 +- milstd2525/icons/war/sngaewtl-------.svg | 28 +- milstd2525/icons/war/sngaewtm-------.svg | 28 +- milstd2525/icons/war/sngaewx--------.svg | 28 +- milstd2525/icons/war/sngaewxh-------.svg | 28 +- milstd2525/icons/war/sngaewxl-------.svg | 28 +- milstd2525/icons/war/sngaewxm-------.svg | 28 +- milstd2525/icons/war/sngaewz--------.svg | 28 +- milstd2525/icons/war/sngaewzh-------.svg | 28 +- milstd2525/icons/war/sngaewzl-------.svg | 28 +- milstd2525/icons/war/sngaewzm-------.svg | 28 +- milstd2525/icons/war/sngaexf--------.svg | 28 +- milstd2525/icons/war/sngaexi--------.svg | 28 +- milstd2525/icons/war/sngaexl--------.svg | 28 +- milstd2525/icons/war/sngaexm--------.svg | 28 +- milstd2525/icons/war/sngaexmc-------.svg | 28 +- milstd2525/icons/war/sngaexml-------.svg | 28 +- milstd2525/icons/war/sngaexn--------.svg | 28 +- milstd2525/icons/war/sngai----------.svg | 28 +- milstd2525/icons/war/sngaib---------.svg | 28 +- milstd2525/icons/war/sngaiba--------.svg | 28 +- milstd2525/icons/war/sngaibn--------.svg | 28 +- milstd2525/icons/war/sngaie---------.svg | 28 +- milstd2525/icons/war/sngaig---------.svg | 28 +- milstd2525/icons/war/sngaima--------.svg | 28 +- milstd2525/icons/war/sngaimc--------.svg | 28 +- milstd2525/icons/war/sngaime--------.svg | 28 +- milstd2525/icons/war/sngaimf--------.svg | 28 +- milstd2525/icons/war/sngaimfa-------.svg | 28 +- milstd2525/icons/war/sngaimfp-------.svg | 28 +- milstd2525/icons/war/sngaimfpw------.svg | 28 +- milstd2525/icons/war/sngaimfs-------.svg | 28 +- milstd2525/icons/war/sngaimg--------.svg | 28 +- milstd2525/icons/war/sngaimm--------.svg | 28 +- milstd2525/icons/war/sngaimn--------.svg | 28 +- milstd2525/icons/war/sngaimnb-------.svg | 28 +- milstd2525/icons/war/sngaims--------.svg | 28 +- milstd2525/icons/war/sngaimv--------.svg | 28 +- milstd2525/icons/war/sngaip---------.svg | 28 +- milstd2525/icons/war/sngaipd--------.svg | 28 +- milstd2525/icons/war/sngair---------.svg | 28 +- milstd2525/icons/war/sngairm--------.svg | 28 +- milstd2525/icons/war/sngairn--------.svg | 28 +- milstd2525/icons/war/sngairnb-------.svg | 28 +- milstd2525/icons/war/sngairnc-------.svg | 28 +- milstd2525/icons/war/sngairnn-------.svg | 28 +- milstd2525/icons/war/sngairp--------.svg | 28 +- milstd2525/icons/war/sngait---------.svg | 28 +- milstd2525/icons/war/sngaiu---------.svg | 28 +- milstd2525/icons/war/sngaiue--------.svg | 28 +- milstd2525/icons/war/sngaiued-------.svg | 28 +- milstd2525/icons/war/sngaiuef-------.svg | 28 +- milstd2525/icons/war/sngaiuen-------.svg | 28 +- milstd2525/icons/war/sngaiup--------.svg | 28 +- milstd2525/icons/war/sngaiur--------.svg | 28 +- milstd2525/icons/war/sngaiut--------.svg | 28 +- milstd2525/icons/war/sngaix---------.svg | 28 +- milstd2525/icons/war/sngaixh--------.svg | 28 +- milstd2525/icons/war/sngau----------.svg | 28 +- milstd2525/icons/war/sngauc---------.svg | 28 +- milstd2525/icons/war/sngauca--------.svg | 28 +- milstd2525/icons/war/sngaucaa-------.svg | 28 +- milstd2525/icons/war/sngaucaaa------.svg | 28 +- milstd2525/icons/war/sngaucaaas-----.svg | 28 +- milstd2525/icons/war/sngaucaaat-----.svg | 28 +- milstd2525/icons/war/sngaucaaaw-----.svg | 28 +- milstd2525/icons/war/sngaucaac------.svg | 28 +- milstd2525/icons/war/sngaucaad------.svg | 28 +- milstd2525/icons/war/sngaucaal------.svg | 28 +- milstd2525/icons/war/sngaucaam------.svg | 28 +- milstd2525/icons/war/sngaucaao------.svg | 28 +- milstd2525/icons/war/sngaucaaos-----.svg | 28 +- milstd2525/icons/war/sngaucaas------.svg | 28 +- milstd2525/icons/war/sngaucaau------.svg | 28 +- milstd2525/icons/war/sngaucat-------.svg | 28 +- milstd2525/icons/war/sngaucata------.svg | 28 +- milstd2525/icons/war/sngaucath------.svg | 28 +- milstd2525/icons/war/sngaucatl------.svg | 28 +- milstd2525/icons/war/sngaucatm------.svg | 28 +- milstd2525/icons/war/sngaucatr------.svg | 28 +- milstd2525/icons/war/sngaucatw------.svg | 28 +- milstd2525/icons/war/sngaucatwr-----.svg | 28 +- milstd2525/icons/war/sngaucaw-------.svg | 28 +- milstd2525/icons/war/sngaucawa------.svg | 28 +- milstd2525/icons/war/sngaucawh------.svg | 28 +- milstd2525/icons/war/sngaucawl------.svg | 28 +- milstd2525/icons/war/sngaucawm------.svg | 28 +- milstd2525/icons/war/sngaucawr------.svg | 28 +- milstd2525/icons/war/sngaucaws------.svg | 28 +- milstd2525/icons/war/sngaucaww------.svg | 28 +- milstd2525/icons/war/sngaucawwr-----.svg | 28 +- milstd2525/icons/war/sngaucd--------.svg | 28 +- milstd2525/icons/war/sngaucdc-------.svg | 28 +- milstd2525/icons/war/sngaucdg-------.svg | 28 +- milstd2525/icons/war/sngaucdh-------.svg | 28 +- milstd2525/icons/war/sngaucdhh------.svg | 28 +- milstd2525/icons/war/sngaucdhp------.svg | 28 +- milstd2525/icons/war/sngaucdm-------.svg | 28 +- milstd2525/icons/war/sngaucdmh------.svg | 28 +- milstd2525/icons/war/sngaucdml------.svg | 28 +- milstd2525/icons/war/sngaucdmla-----.svg | 28 +- milstd2525/icons/war/sngaucdmm------.svg | 28 +- milstd2525/icons/war/sngaucdo-------.svg | 28 +- milstd2525/icons/war/sngaucds-------.svg | 28 +- milstd2525/icons/war/sngaucdsc------.svg | 28 +- milstd2525/icons/war/sngaucdss------.svg | 28 +- milstd2525/icons/war/sngaucdsv------.svg | 28 +- milstd2525/icons/war/sngaucdt-------.svg | 28 +- milstd2525/icons/war/sngauce--------.svg | 28 +- milstd2525/icons/war/sngaucec-------.svg | 28 +- milstd2525/icons/war/sngauceca------.svg | 28 +- milstd2525/icons/war/sngaucecc------.svg | 28 +- milstd2525/icons/war/sngaucech------.svg | 28 +- milstd2525/icons/war/sngaucecl------.svg | 28 +- milstd2525/icons/war/sngaucecm------.svg | 28 +- milstd2525/icons/war/sngauceco------.svg | 28 +- milstd2525/icons/war/sngaucecr------.svg | 28 +- milstd2525/icons/war/sngaucecs------.svg | 28 +- milstd2525/icons/war/sngaucect------.svg | 28 +- milstd2525/icons/war/sngaucecw------.svg | 28 +- milstd2525/icons/war/sngaucen-------.svg | 28 +- milstd2525/icons/war/sngaucenn------.svg | 28 +- milstd2525/icons/war/sngaucf--------.svg | 28 +- milstd2525/icons/war/sngaucfh-------.svg | 28 +- milstd2525/icons/war/sngaucfha------.svg | 28 +- milstd2525/icons/war/sngaucfhc------.svg | 28 +- milstd2525/icons/war/sngaucfhe------.svg | 28 +- milstd2525/icons/war/sngaucfhh------.svg | 28 +- milstd2525/icons/war/sngaucfhl------.svg | 28 +- milstd2525/icons/war/sngaucfhm------.svg | 28 +- milstd2525/icons/war/sngaucfho------.svg | 28 +- milstd2525/icons/war/sngaucfhs------.svg | 28 +- milstd2525/icons/war/sngaucfhx------.svg | 28 +- milstd2525/icons/war/sngaucfm-------.svg | 28 +- milstd2525/icons/war/sngaucfml------.svg | 28 +- milstd2525/icons/war/sngaucfms------.svg | 28 +- milstd2525/icons/war/sngaucfmt------.svg | 28 +- milstd2525/icons/war/sngaucfmta-----.svg | 28 +- milstd2525/icons/war/sngaucfmtc-----.svg | 28 +- milstd2525/icons/war/sngaucfmto-----.svg | 28 +- milstd2525/icons/war/sngaucfmts-----.svg | 28 +- milstd2525/icons/war/sngaucfmw------.svg | 28 +- milstd2525/icons/war/sngaucfo-------.svg | 28 +- milstd2525/icons/war/sngaucfoa------.svg | 28 +- milstd2525/icons/war/sngaucfol------.svg | 28 +- milstd2525/icons/war/sngaucfoo------.svg | 28 +- milstd2525/icons/war/sngaucfos------.svg | 28 +- milstd2525/icons/war/sngaucfr-------.svg | 28 +- milstd2525/icons/war/sngaucfrm------.svg | 28 +- milstd2525/icons/war/sngaucfrmr-----.svg | 28 +- milstd2525/icons/war/sngaucfrms-----.svg | 28 +- milstd2525/icons/war/sngaucfrmt-----.svg | 28 +- milstd2525/icons/war/sngaucfrs------.svg | 28 +- milstd2525/icons/war/sngaucfrsr-----.svg | 28 +- milstd2525/icons/war/sngaucfrss-----.svg | 28 +- milstd2525/icons/war/sngaucfrst-----.svg | 28 +- milstd2525/icons/war/sngaucfs-------.svg | 28 +- milstd2525/icons/war/sngaucfsa------.svg | 28 +- milstd2525/icons/war/sngaucfsl------.svg | 28 +- milstd2525/icons/war/sngaucfso------.svg | 28 +- milstd2525/icons/war/sngaucfss------.svg | 28 +- milstd2525/icons/war/sngaucft-------.svg | 28 +- milstd2525/icons/war/sngaucfta------.svg | 28 +- milstd2525/icons/war/sngaucftc------.svg | 28 +- milstd2525/icons/war/sngaucftcd-----.svg | 28 +- milstd2525/icons/war/sngaucftcm-----.svg | 28 +- milstd2525/icons/war/sngaucftf------.svg | 28 +- milstd2525/icons/war/sngaucftr------.svg | 28 +- milstd2525/icons/war/sngaucfts------.svg | 28 +- milstd2525/icons/war/sngauci--------.svg | 28 +- milstd2525/icons/war/sngaucia-------.svg | 28 +- milstd2525/icons/war/sngaucic-------.svg | 28 +- milstd2525/icons/war/sngaucii-------.svg | 28 +- milstd2525/icons/war/sngaucil-------.svg | 28 +- milstd2525/icons/war/sngaucim-------.svg | 28 +- milstd2525/icons/war/sngaucin-------.svg | 28 +- milstd2525/icons/war/sngaucio-------.svg | 28 +- milstd2525/icons/war/sngaucis-------.svg | 28 +- milstd2525/icons/war/sngauciz-------.svg | 28 +- milstd2525/icons/war/sngaucm--------.svg | 28 +- milstd2525/icons/war/sngaucms-------.svg | 28 +- milstd2525/icons/war/sngaucmt-------.svg | 28 +- milstd2525/icons/war/sngaucr--------.svg | 28 +- milstd2525/icons/war/sngaucra-------.svg | 28 +- milstd2525/icons/war/sngaucrc-------.svg | 28 +- milstd2525/icons/war/sngaucrh-------.svg | 28 +- milstd2525/icons/war/sngaucrl-------.svg | 28 +- milstd2525/icons/war/sngaucro-------.svg | 28 +- milstd2525/icons/war/sngaucrr-------.svg | 28 +- milstd2525/icons/war/sngaucrrd------.svg | 28 +- milstd2525/icons/war/sngaucrrf------.svg | 28 +- milstd2525/icons/war/sngaucrrl------.svg | 28 +- milstd2525/icons/war/sngaucrs-------.svg | 28 +- milstd2525/icons/war/sngaucrv-------.svg | 28 +- milstd2525/icons/war/sngaucrva------.svg | 28 +- milstd2525/icons/war/sngaucrvg------.svg | 28 +- milstd2525/icons/war/sngaucrvm------.svg | 28 +- milstd2525/icons/war/sngaucrvo------.svg | 28 +- milstd2525/icons/war/sngaucrx-------.svg | 28 +- milstd2525/icons/war/sngaucs--------.svg | 28 +- milstd2525/icons/war/sngaucsa-------.svg | 28 +- milstd2525/icons/war/sngaucsg-------.svg | 28 +- milstd2525/icons/war/sngaucsga------.svg | 28 +- milstd2525/icons/war/sngaucsgd------.svg | 28 +- milstd2525/icons/war/sngaucsgm------.svg | 28 +- milstd2525/icons/war/sngaucsm-------.svg | 28 +- milstd2525/icons/war/sngaucsr-------.svg | 28 +- milstd2525/icons/war/sngaucsw-------.svg | 28 +- milstd2525/icons/war/sngaucv--------.svg | 28 +- milstd2525/icons/war/sngaucvc-------.svg | 28 +- milstd2525/icons/war/sngaucvf-------.svg | 28 +- milstd2525/icons/war/sngaucvfa------.svg | 28 +- milstd2525/icons/war/sngaucvfr------.svg | 28 +- milstd2525/icons/war/sngaucvfu------.svg | 28 +- milstd2525/icons/war/sngaucvr-------.svg | 28 +- milstd2525/icons/war/sngaucvra------.svg | 28 +- milstd2525/icons/war/sngaucvrm------.svg | 28 +- milstd2525/icons/war/sngaucvrs------.svg | 28 +- milstd2525/icons/war/sngaucvru------.svg | 28 +- milstd2525/icons/war/sngaucvruc-----.svg | 28 +- milstd2525/icons/war/sngaucvrue-----.svg | 28 +- milstd2525/icons/war/sngaucvruh-----.svg | 28 +- milstd2525/icons/war/sngaucvrul-----.svg | 28 +- milstd2525/icons/war/sngaucvrum-----.svg | 28 +- milstd2525/icons/war/sngaucvrw------.svg | 28 +- milstd2525/icons/war/sngaucvs-------.svg | 28 +- milstd2525/icons/war/sngaucvu-------.svg | 28 +- milstd2525/icons/war/sngaucvuf------.svg | 28 +- milstd2525/icons/war/sngaucvur------.svg | 28 +- milstd2525/icons/war/sngaucvv-------.svg | 28 +- milstd2525/icons/war/sngauh---------.svg | 28 +- milstd2525/icons/war/sngaus---------.svg | 28 +- milstd2525/icons/war/sngausa--------.svg | 28 +- milstd2525/icons/war/sngausac-------.svg | 28 +- milstd2525/icons/war/sngausaf-------.svg | 28 +- milstd2525/icons/war/sngausafc------.svg | 28 +- milstd2525/icons/war/sngausaft------.svg | 28 +- milstd2525/icons/war/sngausaj-------.svg | 28 +- milstd2525/icons/war/sngausajc------.svg | 28 +- milstd2525/icons/war/sngausajt------.svg | 28 +- milstd2525/icons/war/sngausal-------.svg | 28 +- milstd2525/icons/war/sngausalc------.svg | 28 +- milstd2525/icons/war/sngausalt------.svg | 28 +- milstd2525/icons/war/sngausam-------.svg | 28 +- milstd2525/icons/war/sngausamc------.svg | 28 +- milstd2525/icons/war/sngausamt------.svg | 28 +- milstd2525/icons/war/sngausao-------.svg | 28 +- milstd2525/icons/war/sngausaoc------.svg | 28 +- milstd2525/icons/war/sngausaot------.svg | 28 +- milstd2525/icons/war/sngausap-------.svg | 28 +- milstd2525/icons/war/sngausapb------.svg | 28 +- milstd2525/icons/war/sngausapbc-----.svg | 28 +- milstd2525/icons/war/sngausapbt-----.svg | 28 +- milstd2525/icons/war/sngausapc------.svg | 28 +- milstd2525/icons/war/sngausapm------.svg | 28 +- milstd2525/icons/war/sngausapmc-----.svg | 28 +- milstd2525/icons/war/sngausapmt-----.svg | 28 +- milstd2525/icons/war/sngausapt------.svg | 28 +- milstd2525/icons/war/sngausaq-------.svg | 28 +- milstd2525/icons/war/sngausaqc------.svg | 28 +- milstd2525/icons/war/sngausaqt------.svg | 28 +- milstd2525/icons/war/sngausar-------.svg | 28 +- milstd2525/icons/war/sngausarc------.svg | 28 +- milstd2525/icons/war/sngausart------.svg | 28 +- milstd2525/icons/war/sngausas-------.svg | 28 +- milstd2525/icons/war/sngausasc------.svg | 28 +- milstd2525/icons/war/sngausast------.svg | 28 +- milstd2525/icons/war/sngausat-------.svg | 28 +- milstd2525/icons/war/sngausaw-------.svg | 28 +- milstd2525/icons/war/sngausawc------.svg | 28 +- milstd2525/icons/war/sngausawt------.svg | 28 +- milstd2525/icons/war/sngausax-------.svg | 28 +- milstd2525/icons/war/sngausaxc------.svg | 28 +- milstd2525/icons/war/sngausaxt------.svg | 28 +- milstd2525/icons/war/sngausm--------.svg | 28 +- milstd2525/icons/war/sngausmc-------.svg | 28 +- milstd2525/icons/war/sngausmd-------.svg | 28 +- milstd2525/icons/war/sngausmdc------.svg | 28 +- milstd2525/icons/war/sngausmdt------.svg | 28 +- milstd2525/icons/war/sngausmm-------.svg | 28 +- milstd2525/icons/war/sngausmmc------.svg | 28 +- milstd2525/icons/war/sngausmmt------.svg | 28 +- milstd2525/icons/war/sngausmp-------.svg | 28 +- milstd2525/icons/war/sngausmpc------.svg | 28 +- milstd2525/icons/war/sngausmpt------.svg | 28 +- milstd2525/icons/war/sngausmt-------.svg | 28 +- milstd2525/icons/war/sngausmv-------.svg | 28 +- milstd2525/icons/war/sngausmvc------.svg | 28 +- milstd2525/icons/war/sngausmvt------.svg | 28 +- milstd2525/icons/war/sngauss--------.svg | 28 +- milstd2525/icons/war/sngauss1-------.svg | 28 +- milstd2525/icons/war/sngauss1c------.svg | 28 +- milstd2525/icons/war/sngauss1t------.svg | 28 +- milstd2525/icons/war/sngauss2-------.svg | 28 +- milstd2525/icons/war/sngauss2c------.svg | 28 +- milstd2525/icons/war/sngauss2t------.svg | 28 +- milstd2525/icons/war/sngauss3-------.svg | 28 +- milstd2525/icons/war/sngauss3a------.svg | 28 +- milstd2525/icons/war/sngauss3ac-----.svg | 28 +- milstd2525/icons/war/sngauss3at-----.svg | 28 +- milstd2525/icons/war/sngauss3c------.svg | 28 +- milstd2525/icons/war/sngauss3t------.svg | 28 +- milstd2525/icons/war/sngauss4-------.svg | 28 +- milstd2525/icons/war/sngauss4c------.svg | 28 +- milstd2525/icons/war/sngauss4t------.svg | 28 +- milstd2525/icons/war/sngauss5-------.svg | 28 +- milstd2525/icons/war/sngauss5c------.svg | 28 +- milstd2525/icons/war/sngauss5t------.svg | 28 +- milstd2525/icons/war/sngauss6-------.svg | 28 +- milstd2525/icons/war/sngauss6c------.svg | 28 +- milstd2525/icons/war/sngauss6t------.svg | 28 +- milstd2525/icons/war/sngauss7-------.svg | 28 +- milstd2525/icons/war/sngauss7c------.svg | 28 +- milstd2525/icons/war/sngauss7t------.svg | 28 +- milstd2525/icons/war/sngauss8-------.svg | 28 +- milstd2525/icons/war/sngauss8c------.svg | 28 +- milstd2525/icons/war/sngauss8t------.svg | 28 +- milstd2525/icons/war/sngauss9-------.svg | 28 +- milstd2525/icons/war/sngauss9c------.svg | 28 +- milstd2525/icons/war/sngauss9t------.svg | 28 +- milstd2525/icons/war/sngaussc-------.svg | 28 +- milstd2525/icons/war/sngaussl-------.svg | 28 +- milstd2525/icons/war/sngausslc------.svg | 28 +- milstd2525/icons/war/sngausslt------.svg | 28 +- milstd2525/icons/war/sngausst-------.svg | 28 +- milstd2525/icons/war/sngaussw-------.svg | 28 +- milstd2525/icons/war/sngausswc------.svg | 28 +- milstd2525/icons/war/sngausswp------.svg | 28 +- milstd2525/icons/war/sngausswpc-----.svg | 28 +- milstd2525/icons/war/sngausswpt-----.svg | 28 +- milstd2525/icons/war/sngausswt------.svg | 28 +- milstd2525/icons/war/sngaussx-------.svg | 28 +- milstd2525/icons/war/sngaussxc------.svg | 28 +- milstd2525/icons/war/sngaussxt------.svg | 28 +- milstd2525/icons/war/sngaust--------.svg | 28 +- milstd2525/icons/war/sngausta-------.svg | 28 +- milstd2525/icons/war/sngaustac------.svg | 28 +- milstd2525/icons/war/sngaustat------.svg | 28 +- milstd2525/icons/war/sngaustc-------.svg | 28 +- milstd2525/icons/war/sngausti-------.svg | 28 +- milstd2525/icons/war/sngaustic------.svg | 28 +- milstd2525/icons/war/sngaustit------.svg | 28 +- milstd2525/icons/war/sngaustm-------.svg | 28 +- milstd2525/icons/war/sngaustmc------.svg | 28 +- milstd2525/icons/war/sngaustmt------.svg | 28 +- milstd2525/icons/war/sngaustr-------.svg | 28 +- milstd2525/icons/war/sngaustrc------.svg | 28 +- milstd2525/icons/war/sngaustrt------.svg | 28 +- milstd2525/icons/war/sngausts-------.svg | 28 +- milstd2525/icons/war/sngaustsc------.svg | 28 +- milstd2525/icons/war/sngaustst------.svg | 28 +- milstd2525/icons/war/sngaustt-------.svg | 28 +- milstd2525/icons/war/sngausx--------.svg | 28 +- milstd2525/icons/war/sngausxc-------.svg | 28 +- milstd2525/icons/war/sngausxe-------.svg | 28 +- milstd2525/icons/war/sngausxec------.svg | 28 +- milstd2525/icons/war/sngausxet------.svg | 28 +- milstd2525/icons/war/sngausxh-------.svg | 28 +- milstd2525/icons/war/sngausxhc------.svg | 28 +- milstd2525/icons/war/sngausxht------.svg | 28 +- milstd2525/icons/war/sngausxo-------.svg | 28 +- milstd2525/icons/war/sngausxoc------.svg | 28 +- milstd2525/icons/war/sngausxom------.svg | 28 +- milstd2525/icons/war/sngausxomc-----.svg | 28 +- milstd2525/icons/war/sngausxomt-----.svg | 28 +- milstd2525/icons/war/sngausxot------.svg | 28 +- milstd2525/icons/war/sngausxr-------.svg | 28 +- milstd2525/icons/war/sngausxrc------.svg | 28 +- milstd2525/icons/war/sngausxrt------.svg | 28 +- milstd2525/icons/war/sngausxt-------.svg | 28 +- milstd2525/icons/war/sngauu---------.svg | 28 +- milstd2525/icons/war/sngauua--------.svg | 28 +- milstd2525/icons/war/sngauuab-------.svg | 28 +- milstd2525/icons/war/sngauuabr------.svg | 28 +- milstd2525/icons/war/sngauuac-------.svg | 28 +- milstd2525/icons/war/sngauuacc------.svg | 28 +- milstd2525/icons/war/sngauuacck-----.svg | 28 +- milstd2525/icons/war/sngauuaccm-----.svg | 28 +- milstd2525/icons/war/sngauuacr------.svg | 28 +- milstd2525/icons/war/sngauuacrs-----.svg | 28 +- milstd2525/icons/war/sngauuacrw-----.svg | 28 +- milstd2525/icons/war/sngauuacs------.svg | 28 +- milstd2525/icons/war/sngauuacsa-----.svg | 28 +- milstd2525/icons/war/sngauuacsm-----.svg | 28 +- milstd2525/icons/war/sngauuad-------.svg | 28 +- milstd2525/icons/war/sngauuan-------.svg | 28 +- milstd2525/icons/war/sngauue--------.svg | 28 +- milstd2525/icons/war/sngauui--------.svg | 28 +- milstd2525/icons/war/sngauul--------.svg | 28 +- milstd2525/icons/war/sngauulc-------.svg | 28 +- milstd2525/icons/war/sngauuld-------.svg | 28 +- milstd2525/icons/war/sngauulf-------.svg | 28 +- milstd2525/icons/war/sngauulm-------.svg | 28 +- milstd2525/icons/war/sngauuls-------.svg | 28 +- milstd2525/icons/war/sngauum--------.svg | 28 +- milstd2525/icons/war/sngauuma-------.svg | 28 +- milstd2525/icons/war/sngauumc-------.svg | 28 +- milstd2525/icons/war/sngauumj-------.svg | 28 +- milstd2525/icons/war/sngauummo------.svg | 28 +- milstd2525/icons/war/sngauumo-------.svg | 28 +- milstd2525/icons/war/sngauumq-------.svg | 28 +- milstd2525/icons/war/sngauumr-------.svg | 28 +- milstd2525/icons/war/sngauumrg------.svg | 28 +- milstd2525/icons/war/sngauumrs------.svg | 28 +- milstd2525/icons/war/sngauumrss-----.svg | 28 +- milstd2525/icons/war/sngauumrx------.svg | 28 +- milstd2525/icons/war/sngauums-------.svg | 28 +- milstd2525/icons/war/sngauumse------.svg | 28 +- milstd2525/icons/war/sngauumsea-----.svg | 28 +- milstd2525/icons/war/sngauumsec-----.svg | 28 +- milstd2525/icons/war/sngauumsed-----.svg | 28 +- milstd2525/icons/war/sngauumsei-----.svg | 28 +- milstd2525/icons/war/sngauumsej-----.svg | 28 +- milstd2525/icons/war/sngauumset-----.svg | 28 +- milstd2525/icons/war/sngauumt-------.svg | 28 +- milstd2525/icons/war/sngauup--------.svg | 28 +- milstd2525/icons/war/sngauus--------.svg | 28 +- milstd2525/icons/war/sngauusa-------.svg | 28 +- milstd2525/icons/war/sngauusc-------.svg | 28 +- milstd2525/icons/war/sngauuscl------.svg | 28 +- milstd2525/icons/war/sngauusf-------.svg | 28 +- milstd2525/icons/war/sngauusm-------.svg | 28 +- milstd2525/icons/war/sngauusml------.svg | 28 +- milstd2525/icons/war/sngauusmn------.svg | 28 +- milstd2525/icons/war/sngauusms------.svg | 28 +- milstd2525/icons/war/sngauuso-------.svg | 28 +- milstd2525/icons/war/sngauusr-------.svg | 28 +- milstd2525/icons/war/sngauusrs------.svg | 28 +- milstd2525/icons/war/sngauusrt------.svg | 28 +- milstd2525/icons/war/sngauusrw------.svg | 28 +- milstd2525/icons/war/sngauuss-------.svg | 28 +- milstd2525/icons/war/sngauusw-------.svg | 28 +- milstd2525/icons/war/sngauusx-------.svg | 28 +- milstd2525/icons/war/sngp-----------.svg | 28 +- milstd2525/icons/war/sngpe----------.svg | 28 +- milstd2525/icons/war/sngpes---------.svg | 28 +- milstd2525/icons/war/sngpese--------.svg | 28 +- milstd2525/icons/war/sngpesr--------.svg | 28 +- milstd2525/icons/war/sngpev---------.svg | 28 +- milstd2525/icons/war/sngpeva--------.svg | 28 +- milstd2525/icons/war/sngpevaa-------.svg | 28 +- milstd2525/icons/war/sngpevaar------.svg | 28 +- milstd2525/icons/war/sngpevac-------.svg | 28 +- milstd2525/icons/war/sngpevai-------.svg | 28 +- milstd2525/icons/war/sngpeval-------.svg | 28 +- milstd2525/icons/war/sngpevas-------.svg | 28 +- milstd2525/icons/war/sngpevat-------.svg | 28 +- milstd2525/icons/war/sngpevath------.svg | 28 +- milstd2525/icons/war/sngpevathr-----.svg | 28 +- milstd2525/icons/war/sngpevatl------.svg | 28 +- milstd2525/icons/war/sngpevatlr-----.svg | 28 +- milstd2525/icons/war/sngpevatm------.svg | 28 +- milstd2525/icons/war/sngpevatmr-----.svg | 28 +- milstd2525/icons/war/sngpevc--------.svg | 28 +- milstd2525/icons/war/sngpevca-------.svg | 28 +- milstd2525/icons/war/sngpevcah------.svg | 28 +- milstd2525/icons/war/sngpevcal------.svg | 28 +- milstd2525/icons/war/sngpevcam------.svg | 28 +- milstd2525/icons/war/sngpevcf-------.svg | 28 +- milstd2525/icons/war/sngpevcfh------.svg | 28 +- milstd2525/icons/war/sngpevcfl------.svg | 28 +- milstd2525/icons/war/sngpevcfm------.svg | 28 +- milstd2525/icons/war/sngpevcj-------.svg | 28 +- milstd2525/icons/war/sngpevcjh------.svg | 28 +- milstd2525/icons/war/sngpevcjl------.svg | 28 +- milstd2525/icons/war/sngpevcjm------.svg | 28 +- milstd2525/icons/war/sngpevcm-------.svg | 28 +- milstd2525/icons/war/sngpevcmh------.svg | 28 +- milstd2525/icons/war/sngpevcml------.svg | 28 +- milstd2525/icons/war/sngpevcmm------.svg | 28 +- milstd2525/icons/war/sngpevco-------.svg | 28 +- milstd2525/icons/war/sngpevcoh------.svg | 28 +- milstd2525/icons/war/sngpevcol------.svg | 28 +- milstd2525/icons/war/sngpevcom------.svg | 28 +- milstd2525/icons/war/sngpevct-------.svg | 28 +- milstd2525/icons/war/sngpevcth------.svg | 28 +- milstd2525/icons/war/sngpevctl------.svg | 28 +- milstd2525/icons/war/sngpevctm------.svg | 28 +- milstd2525/icons/war/sngpevcu-------.svg | 28 +- milstd2525/icons/war/sngpevcuh------.svg | 28 +- milstd2525/icons/war/sngpevcul------.svg | 28 +- milstd2525/icons/war/sngpevcum------.svg | 28 +- milstd2525/icons/war/sngpeve--------.svg | 28 +- milstd2525/icons/war/sngpevea-------.svg | 28 +- milstd2525/icons/war/sngpeveaa------.svg | 28 +- milstd2525/icons/war/sngpeveat------.svg | 28 +- milstd2525/icons/war/sngpeveb-------.svg | 28 +- milstd2525/icons/war/sngpevec-------.svg | 28 +- milstd2525/icons/war/sngpeved-------.svg | 28 +- milstd2525/icons/war/sngpeveda------.svg | 28 +- milstd2525/icons/war/sngpevee-------.svg | 28 +- milstd2525/icons/war/sngpevef-------.svg | 28 +- milstd2525/icons/war/sngpeveh-------.svg | 28 +- milstd2525/icons/war/sngpevem-------.svg | 28 +- milstd2525/icons/war/sngpeveml------.svg | 28 +- milstd2525/icons/war/sngpevemv------.svg | 28 +- milstd2525/icons/war/sngpever-------.svg | 28 +- milstd2525/icons/war/sngpeves-------.svg | 28 +- milstd2525/icons/war/sngpevm--------.svg | 28 +- milstd2525/icons/war/sngpevs--------.svg | 28 +- milstd2525/icons/war/sngpevsc-------.svg | 28 +- milstd2525/icons/war/sngpevsp-------.svg | 28 +- milstd2525/icons/war/sngpevsr-------.svg | 28 +- milstd2525/icons/war/sngpevst-------.svg | 28 +- milstd2525/icons/war/sngpevsw-------.svg | 28 +- milstd2525/icons/war/sngpevt--------.svg | 28 +- milstd2525/icons/war/sngpevu--------.svg | 28 +- milstd2525/icons/war/sngpevua-------.svg | 28 +- milstd2525/icons/war/sngpevuaa------.svg | 28 +- milstd2525/icons/war/sngpevub-------.svg | 28 +- milstd2525/icons/war/sngpevul-------.svg | 28 +- milstd2525/icons/war/sngpevur-------.svg | 28 +- milstd2525/icons/war/sngpevus-------.svg | 28 +- milstd2525/icons/war/sngpevush------.svg | 28 +- milstd2525/icons/war/sngpevusl------.svg | 28 +- milstd2525/icons/war/sngpevusm------.svg | 28 +- milstd2525/icons/war/sngpevut-------.svg | 28 +- milstd2525/icons/war/sngpevuth------.svg | 28 +- milstd2525/icons/war/sngpevutl------.svg | 28 +- milstd2525/icons/war/sngpevux-------.svg | 28 +- milstd2525/icons/war/sngpewa--------.svg | 28 +- milstd2525/icons/war/sngpewah-------.svg | 28 +- milstd2525/icons/war/sngpewal-------.svg | 28 +- milstd2525/icons/war/sngpewam-------.svg | 28 +- milstd2525/icons/war/sngpewd--------.svg | 28 +- milstd2525/icons/war/sngpewdh-------.svg | 28 +- milstd2525/icons/war/sngpewdhs------.svg | 28 +- milstd2525/icons/war/sngpewdl-------.svg | 28 +- milstd2525/icons/war/sngpewdls------.svg | 28 +- milstd2525/icons/war/sngpewdm-------.svg | 28 +- milstd2525/icons/war/sngpewdms------.svg | 28 +- milstd2525/icons/war/sngpewg--------.svg | 28 +- milstd2525/icons/war/sngpewgh-------.svg | 28 +- milstd2525/icons/war/sngpewgl-------.svg | 28 +- milstd2525/icons/war/sngpewgm-------.svg | 28 +- milstd2525/icons/war/sngpewgr-------.svg | 28 +- milstd2525/icons/war/sngpewh--------.svg | 28 +- milstd2525/icons/war/sngpewhh-------.svg | 28 +- milstd2525/icons/war/sngpewhhs------.svg | 28 +- milstd2525/icons/war/sngpewhl-------.svg | 28 +- milstd2525/icons/war/sngpewhls------.svg | 28 +- milstd2525/icons/war/sngpewhm-------.svg | 28 +- milstd2525/icons/war/sngpewhms------.svg | 28 +- milstd2525/icons/war/sngpewm--------.svg | 28 +- milstd2525/icons/war/sngpewma-------.svg | 28 +- milstd2525/icons/war/sngpewmai------.svg | 28 +- milstd2525/icons/war/sngpewmaie-----.svg | 28 +- milstd2525/icons/war/sngpewmair-----.svg | 28 +- milstd2525/icons/war/sngpewmal------.svg | 28 +- milstd2525/icons/war/sngpewmale-----.svg | 28 +- milstd2525/icons/war/sngpewmalr-----.svg | 28 +- milstd2525/icons/war/sngpewmas------.svg | 28 +- milstd2525/icons/war/sngpewmase-----.svg | 28 +- milstd2525/icons/war/sngpewmasr-----.svg | 28 +- milstd2525/icons/war/sngpewmat------.svg | 28 +- milstd2525/icons/war/sngpewmate-----.svg | 28 +- milstd2525/icons/war/sngpewmatr-----.svg | 28 +- milstd2525/icons/war/sngpewms-------.svg | 28 +- milstd2525/icons/war/sngpewmsi------.svg | 28 +- milstd2525/icons/war/sngpewmsl------.svg | 28 +- milstd2525/icons/war/sngpewmss------.svg | 28 +- milstd2525/icons/war/sngpewmt-------.svg | 28 +- milstd2525/icons/war/sngpewmth------.svg | 28 +- milstd2525/icons/war/sngpewmtl------.svg | 28 +- milstd2525/icons/war/sngpewmtm------.svg | 28 +- milstd2525/icons/war/sngpewo--------.svg | 28 +- milstd2525/icons/war/sngpewoh-------.svg | 28 +- milstd2525/icons/war/sngpewol-------.svg | 28 +- milstd2525/icons/war/sngpewom-------.svg | 28 +- milstd2525/icons/war/sngpewr--------.svg | 28 +- milstd2525/icons/war/sngpewrh-------.svg | 28 +- milstd2525/icons/war/sngpewrl-------.svg | 28 +- milstd2525/icons/war/sngpewrr-------.svg | 28 +- milstd2525/icons/war/sngpews--------.svg | 28 +- milstd2525/icons/war/sngpewsh-------.svg | 28 +- milstd2525/icons/war/sngpewsl-------.svg | 28 +- milstd2525/icons/war/sngpewsm-------.svg | 28 +- milstd2525/icons/war/sngpewt--------.svg | 28 +- milstd2525/icons/war/sngpewth-------.svg | 28 +- milstd2525/icons/war/sngpewtl-------.svg | 28 +- milstd2525/icons/war/sngpewtm-------.svg | 28 +- milstd2525/icons/war/sngpewx--------.svg | 28 +- milstd2525/icons/war/sngpewxh-------.svg | 28 +- milstd2525/icons/war/sngpewxl-------.svg | 28 +- milstd2525/icons/war/sngpewxm-------.svg | 28 +- milstd2525/icons/war/sngpewz--------.svg | 28 +- milstd2525/icons/war/sngpewzh-------.svg | 28 +- milstd2525/icons/war/sngpewzl-------.svg | 28 +- milstd2525/icons/war/sngpewzm-------.svg | 28 +- milstd2525/icons/war/sngpexf--------.svg | 28 +- milstd2525/icons/war/sngpexi--------.svg | 28 +- milstd2525/icons/war/sngpexl--------.svg | 28 +- milstd2525/icons/war/sngpexm--------.svg | 28 +- milstd2525/icons/war/sngpexmc-------.svg | 28 +- milstd2525/icons/war/sngpexml-------.svg | 28 +- milstd2525/icons/war/sngpexn--------.svg | 28 +- milstd2525/icons/war/sngpi----------.svg | 28 +- milstd2525/icons/war/sngpib---------.svg | 28 +- milstd2525/icons/war/sngpiba--------.svg | 28 +- milstd2525/icons/war/sngpibn--------.svg | 28 +- milstd2525/icons/war/sngpie---------.svg | 28 +- milstd2525/icons/war/sngpig---------.svg | 28 +- milstd2525/icons/war/sngpima--------.svg | 28 +- milstd2525/icons/war/sngpimc--------.svg | 28 +- milstd2525/icons/war/sngpime--------.svg | 28 +- milstd2525/icons/war/sngpimf--------.svg | 28 +- milstd2525/icons/war/sngpimfa-------.svg | 28 +- milstd2525/icons/war/sngpimfp-------.svg | 28 +- milstd2525/icons/war/sngpimfpw------.svg | 28 +- milstd2525/icons/war/sngpimfs-------.svg | 28 +- milstd2525/icons/war/sngpimg--------.svg | 28 +- milstd2525/icons/war/sngpimm--------.svg | 28 +- milstd2525/icons/war/sngpimn--------.svg | 28 +- milstd2525/icons/war/sngpimnb-------.svg | 28 +- milstd2525/icons/war/sngpims--------.svg | 28 +- milstd2525/icons/war/sngpimv--------.svg | 28 +- milstd2525/icons/war/sngpip---------.svg | 28 +- milstd2525/icons/war/sngpipd--------.svg | 28 +- milstd2525/icons/war/sngpir---------.svg | 28 +- milstd2525/icons/war/sngpirm--------.svg | 28 +- milstd2525/icons/war/sngpirn--------.svg | 28 +- milstd2525/icons/war/sngpirnb-------.svg | 28 +- milstd2525/icons/war/sngpirnc-------.svg | 28 +- milstd2525/icons/war/sngpirnn-------.svg | 28 +- milstd2525/icons/war/sngpirp--------.svg | 28 +- milstd2525/icons/war/sngpit---------.svg | 28 +- milstd2525/icons/war/sngpiu---------.svg | 28 +- milstd2525/icons/war/sngpiue--------.svg | 28 +- milstd2525/icons/war/sngpiued-------.svg | 28 +- milstd2525/icons/war/sngpiuef-------.svg | 28 +- milstd2525/icons/war/sngpiuen-------.svg | 28 +- milstd2525/icons/war/sngpiup--------.svg | 28 +- milstd2525/icons/war/sngpiur--------.svg | 28 +- milstd2525/icons/war/sngpiut--------.svg | 28 +- milstd2525/icons/war/sngpix---------.svg | 28 +- milstd2525/icons/war/sngpixh--------.svg | 28 +- milstd2525/icons/war/sngpu----------.svg | 28 +- milstd2525/icons/war/sngpuc---------.svg | 28 +- milstd2525/icons/war/sngpuca--------.svg | 28 +- milstd2525/icons/war/sngpucaa-------.svg | 28 +- milstd2525/icons/war/sngpucaaa------.svg | 28 +- milstd2525/icons/war/sngpucaaas-----.svg | 28 +- milstd2525/icons/war/sngpucaaat-----.svg | 28 +- milstd2525/icons/war/sngpucaaaw-----.svg | 28 +- milstd2525/icons/war/sngpucaac------.svg | 28 +- milstd2525/icons/war/sngpucaad------.svg | 28 +- milstd2525/icons/war/sngpucaal------.svg | 28 +- milstd2525/icons/war/sngpucaam------.svg | 28 +- milstd2525/icons/war/sngpucaao------.svg | 28 +- milstd2525/icons/war/sngpucaaos-----.svg | 28 +- milstd2525/icons/war/sngpucaas------.svg | 28 +- milstd2525/icons/war/sngpucaau------.svg | 28 +- milstd2525/icons/war/sngpucat-------.svg | 28 +- milstd2525/icons/war/sngpucata------.svg | 28 +- milstd2525/icons/war/sngpucath------.svg | 28 +- milstd2525/icons/war/sngpucatl------.svg | 28 +- milstd2525/icons/war/sngpucatm------.svg | 28 +- milstd2525/icons/war/sngpucatr------.svg | 28 +- milstd2525/icons/war/sngpucatw------.svg | 28 +- milstd2525/icons/war/sngpucatwr-----.svg | 28 +- milstd2525/icons/war/sngpucaw-------.svg | 28 +- milstd2525/icons/war/sngpucawa------.svg | 28 +- milstd2525/icons/war/sngpucawh------.svg | 28 +- milstd2525/icons/war/sngpucawl------.svg | 28 +- milstd2525/icons/war/sngpucawm------.svg | 28 +- milstd2525/icons/war/sngpucawr------.svg | 28 +- milstd2525/icons/war/sngpucaws------.svg | 28 +- milstd2525/icons/war/sngpucaww------.svg | 28 +- milstd2525/icons/war/sngpucawwr-----.svg | 28 +- milstd2525/icons/war/sngpucd--------.svg | 28 +- milstd2525/icons/war/sngpucdc-------.svg | 28 +- milstd2525/icons/war/sngpucdg-------.svg | 28 +- milstd2525/icons/war/sngpucdh-------.svg | 28 +- milstd2525/icons/war/sngpucdhh------.svg | 28 +- milstd2525/icons/war/sngpucdhp------.svg | 28 +- milstd2525/icons/war/sngpucdm-------.svg | 28 +- milstd2525/icons/war/sngpucdmh------.svg | 28 +- milstd2525/icons/war/sngpucdml------.svg | 28 +- milstd2525/icons/war/sngpucdmla-----.svg | 28 +- milstd2525/icons/war/sngpucdmm------.svg | 28 +- milstd2525/icons/war/sngpucdo-------.svg | 28 +- milstd2525/icons/war/sngpucds-------.svg | 28 +- milstd2525/icons/war/sngpucdsc------.svg | 28 +- milstd2525/icons/war/sngpucdss------.svg | 28 +- milstd2525/icons/war/sngpucdsv------.svg | 28 +- milstd2525/icons/war/sngpucdt-------.svg | 28 +- milstd2525/icons/war/sngpuce--------.svg | 28 +- milstd2525/icons/war/sngpucec-------.svg | 28 +- milstd2525/icons/war/sngpuceca------.svg | 28 +- milstd2525/icons/war/sngpucecc------.svg | 28 +- milstd2525/icons/war/sngpucech------.svg | 28 +- milstd2525/icons/war/sngpucecl------.svg | 28 +- milstd2525/icons/war/sngpucecm------.svg | 28 +- milstd2525/icons/war/sngpuceco------.svg | 28 +- milstd2525/icons/war/sngpucecr------.svg | 28 +- milstd2525/icons/war/sngpucecs------.svg | 28 +- milstd2525/icons/war/sngpucect------.svg | 28 +- milstd2525/icons/war/sngpucecw------.svg | 28 +- milstd2525/icons/war/sngpucen-------.svg | 28 +- milstd2525/icons/war/sngpucenn------.svg | 28 +- milstd2525/icons/war/sngpucf--------.svg | 28 +- milstd2525/icons/war/sngpucfh-------.svg | 28 +- milstd2525/icons/war/sngpucfha------.svg | 28 +- milstd2525/icons/war/sngpucfhc------.svg | 28 +- milstd2525/icons/war/sngpucfhe------.svg | 28 +- milstd2525/icons/war/sngpucfhh------.svg | 28 +- milstd2525/icons/war/sngpucfhl------.svg | 28 +- milstd2525/icons/war/sngpucfhm------.svg | 28 +- milstd2525/icons/war/sngpucfho------.svg | 28 +- milstd2525/icons/war/sngpucfhs------.svg | 28 +- milstd2525/icons/war/sngpucfhx------.svg | 28 +- milstd2525/icons/war/sngpucfm-------.svg | 28 +- milstd2525/icons/war/sngpucfml------.svg | 28 +- milstd2525/icons/war/sngpucfms------.svg | 28 +- milstd2525/icons/war/sngpucfmt------.svg | 28 +- milstd2525/icons/war/sngpucfmta-----.svg | 28 +- milstd2525/icons/war/sngpucfmtc-----.svg | 28 +- milstd2525/icons/war/sngpucfmto-----.svg | 28 +- milstd2525/icons/war/sngpucfmts-----.svg | 28 +- milstd2525/icons/war/sngpucfmw------.svg | 28 +- milstd2525/icons/war/sngpucfo-------.svg | 28 +- milstd2525/icons/war/sngpucfoa------.svg | 28 +- milstd2525/icons/war/sngpucfol------.svg | 28 +- milstd2525/icons/war/sngpucfoo------.svg | 28 +- milstd2525/icons/war/sngpucfos------.svg | 28 +- milstd2525/icons/war/sngpucfr-------.svg | 28 +- milstd2525/icons/war/sngpucfrm------.svg | 28 +- milstd2525/icons/war/sngpucfrmr-----.svg | 28 +- milstd2525/icons/war/sngpucfrms-----.svg | 28 +- milstd2525/icons/war/sngpucfrmt-----.svg | 28 +- milstd2525/icons/war/sngpucfrs------.svg | 28 +- milstd2525/icons/war/sngpucfrsr-----.svg | 28 +- milstd2525/icons/war/sngpucfrss-----.svg | 28 +- milstd2525/icons/war/sngpucfrst-----.svg | 28 +- milstd2525/icons/war/sngpucfs-------.svg | 28 +- milstd2525/icons/war/sngpucfsa------.svg | 28 +- milstd2525/icons/war/sngpucfsl------.svg | 28 +- milstd2525/icons/war/sngpucfso------.svg | 28 +- milstd2525/icons/war/sngpucfss------.svg | 28 +- milstd2525/icons/war/sngpucft-------.svg | 28 +- milstd2525/icons/war/sngpucfta------.svg | 28 +- milstd2525/icons/war/sngpucftc------.svg | 28 +- milstd2525/icons/war/sngpucftcd-----.svg | 28 +- milstd2525/icons/war/sngpucftcm-----.svg | 28 +- milstd2525/icons/war/sngpucftf------.svg | 28 +- milstd2525/icons/war/sngpucftr------.svg | 28 +- milstd2525/icons/war/sngpucfts------.svg | 28 +- milstd2525/icons/war/sngpuci--------.svg | 28 +- milstd2525/icons/war/sngpucia-------.svg | 28 +- milstd2525/icons/war/sngpucic-------.svg | 28 +- milstd2525/icons/war/sngpucii-------.svg | 28 +- milstd2525/icons/war/sngpucil-------.svg | 28 +- milstd2525/icons/war/sngpucim-------.svg | 28 +- milstd2525/icons/war/sngpucin-------.svg | 28 +- milstd2525/icons/war/sngpucio-------.svg | 28 +- milstd2525/icons/war/sngpucis-------.svg | 28 +- milstd2525/icons/war/sngpuciz-------.svg | 28 +- milstd2525/icons/war/sngpucm--------.svg | 28 +- milstd2525/icons/war/sngpucms-------.svg | 28 +- milstd2525/icons/war/sngpucmt-------.svg | 28 +- milstd2525/icons/war/sngpucr--------.svg | 28 +- milstd2525/icons/war/sngpucra-------.svg | 28 +- milstd2525/icons/war/sngpucrc-------.svg | 28 +- milstd2525/icons/war/sngpucrh-------.svg | 28 +- milstd2525/icons/war/sngpucrl-------.svg | 28 +- milstd2525/icons/war/sngpucro-------.svg | 28 +- milstd2525/icons/war/sngpucrr-------.svg | 28 +- milstd2525/icons/war/sngpucrrd------.svg | 28 +- milstd2525/icons/war/sngpucrrf------.svg | 28 +- milstd2525/icons/war/sngpucrrl------.svg | 28 +- milstd2525/icons/war/sngpucrs-------.svg | 28 +- milstd2525/icons/war/sngpucrv-------.svg | 28 +- milstd2525/icons/war/sngpucrva------.svg | 28 +- milstd2525/icons/war/sngpucrvg------.svg | 28 +- milstd2525/icons/war/sngpucrvm------.svg | 28 +- milstd2525/icons/war/sngpucrvo------.svg | 28 +- milstd2525/icons/war/sngpucrx-------.svg | 28 +- milstd2525/icons/war/sngpucs--------.svg | 28 +- milstd2525/icons/war/sngpucsa-------.svg | 28 +- milstd2525/icons/war/sngpucsg-------.svg | 28 +- milstd2525/icons/war/sngpucsga------.svg | 28 +- milstd2525/icons/war/sngpucsgd------.svg | 28 +- milstd2525/icons/war/sngpucsgm------.svg | 28 +- milstd2525/icons/war/sngpucsm-------.svg | 28 +- milstd2525/icons/war/sngpucsr-------.svg | 28 +- milstd2525/icons/war/sngpucsw-------.svg | 28 +- milstd2525/icons/war/sngpucv--------.svg | 28 +- milstd2525/icons/war/sngpucvc-------.svg | 28 +- milstd2525/icons/war/sngpucvf-------.svg | 28 +- milstd2525/icons/war/sngpucvfa------.svg | 28 +- milstd2525/icons/war/sngpucvfr------.svg | 28 +- milstd2525/icons/war/sngpucvfu------.svg | 28 +- milstd2525/icons/war/sngpucvr-------.svg | 28 +- milstd2525/icons/war/sngpucvra------.svg | 28 +- milstd2525/icons/war/sngpucvrm------.svg | 28 +- milstd2525/icons/war/sngpucvrs------.svg | 28 +- milstd2525/icons/war/sngpucvru------.svg | 28 +- milstd2525/icons/war/sngpucvruc-----.svg | 28 +- milstd2525/icons/war/sngpucvrue-----.svg | 28 +- milstd2525/icons/war/sngpucvruh-----.svg | 28 +- milstd2525/icons/war/sngpucvrul-----.svg | 28 +- milstd2525/icons/war/sngpucvrum-----.svg | 28 +- milstd2525/icons/war/sngpucvrw------.svg | 28 +- milstd2525/icons/war/sngpucvs-------.svg | 28 +- milstd2525/icons/war/sngpucvu-------.svg | 28 +- milstd2525/icons/war/sngpucvuf------.svg | 28 +- milstd2525/icons/war/sngpucvur------.svg | 28 +- milstd2525/icons/war/sngpucvv-------.svg | 28 +- milstd2525/icons/war/sngpuh---------.svg | 28 +- milstd2525/icons/war/sngpus---------.svg | 28 +- milstd2525/icons/war/sngpusa--------.svg | 28 +- milstd2525/icons/war/sngpusac-------.svg | 28 +- milstd2525/icons/war/sngpusaf-------.svg | 28 +- milstd2525/icons/war/sngpusafc------.svg | 28 +- milstd2525/icons/war/sngpusaft------.svg | 28 +- milstd2525/icons/war/sngpusaj-------.svg | 28 +- milstd2525/icons/war/sngpusajc------.svg | 28 +- milstd2525/icons/war/sngpusajt------.svg | 28 +- milstd2525/icons/war/sngpusal-------.svg | 28 +- milstd2525/icons/war/sngpusalc------.svg | 28 +- milstd2525/icons/war/sngpusalt------.svg | 28 +- milstd2525/icons/war/sngpusam-------.svg | 28 +- milstd2525/icons/war/sngpusamc------.svg | 28 +- milstd2525/icons/war/sngpusamt------.svg | 28 +- milstd2525/icons/war/sngpusao-------.svg | 28 +- milstd2525/icons/war/sngpusaoc------.svg | 28 +- milstd2525/icons/war/sngpusaot------.svg | 28 +- milstd2525/icons/war/sngpusap-------.svg | 28 +- milstd2525/icons/war/sngpusapb------.svg | 28 +- milstd2525/icons/war/sngpusapbc-----.svg | 28 +- milstd2525/icons/war/sngpusapbt-----.svg | 28 +- milstd2525/icons/war/sngpusapc------.svg | 28 +- milstd2525/icons/war/sngpusapm------.svg | 28 +- milstd2525/icons/war/sngpusapmc-----.svg | 28 +- milstd2525/icons/war/sngpusapmt-----.svg | 28 +- milstd2525/icons/war/sngpusapt------.svg | 28 +- milstd2525/icons/war/sngpusaq-------.svg | 28 +- milstd2525/icons/war/sngpusaqc------.svg | 28 +- milstd2525/icons/war/sngpusaqt------.svg | 28 +- milstd2525/icons/war/sngpusar-------.svg | 28 +- milstd2525/icons/war/sngpusarc------.svg | 28 +- milstd2525/icons/war/sngpusart------.svg | 28 +- milstd2525/icons/war/sngpusas-------.svg | 28 +- milstd2525/icons/war/sngpusasc------.svg | 28 +- milstd2525/icons/war/sngpusast------.svg | 28 +- milstd2525/icons/war/sngpusat-------.svg | 28 +- milstd2525/icons/war/sngpusaw-------.svg | 28 +- milstd2525/icons/war/sngpusawc------.svg | 28 +- milstd2525/icons/war/sngpusawt------.svg | 28 +- milstd2525/icons/war/sngpusax-------.svg | 28 +- milstd2525/icons/war/sngpusaxc------.svg | 28 +- milstd2525/icons/war/sngpusaxt------.svg | 28 +- milstd2525/icons/war/sngpusm--------.svg | 28 +- milstd2525/icons/war/sngpusmc-------.svg | 28 +- milstd2525/icons/war/sngpusmd-------.svg | 28 +- milstd2525/icons/war/sngpusmdc------.svg | 28 +- milstd2525/icons/war/sngpusmdt------.svg | 28 +- milstd2525/icons/war/sngpusmm-------.svg | 28 +- milstd2525/icons/war/sngpusmmc------.svg | 28 +- milstd2525/icons/war/sngpusmmt------.svg | 28 +- milstd2525/icons/war/sngpusmp-------.svg | 28 +- milstd2525/icons/war/sngpusmpc------.svg | 28 +- milstd2525/icons/war/sngpusmpt------.svg | 28 +- milstd2525/icons/war/sngpusmt-------.svg | 28 +- milstd2525/icons/war/sngpusmv-------.svg | 28 +- milstd2525/icons/war/sngpusmvc------.svg | 28 +- milstd2525/icons/war/sngpusmvt------.svg | 28 +- milstd2525/icons/war/sngpuss--------.svg | 28 +- milstd2525/icons/war/sngpuss1-------.svg | 28 +- milstd2525/icons/war/sngpuss1c------.svg | 28 +- milstd2525/icons/war/sngpuss1t------.svg | 28 +- milstd2525/icons/war/sngpuss2-------.svg | 28 +- milstd2525/icons/war/sngpuss2c------.svg | 28 +- milstd2525/icons/war/sngpuss2t------.svg | 28 +- milstd2525/icons/war/sngpuss3-------.svg | 28 +- milstd2525/icons/war/sngpuss3a------.svg | 28 +- milstd2525/icons/war/sngpuss3ac-----.svg | 28 +- milstd2525/icons/war/sngpuss3at-----.svg | 28 +- milstd2525/icons/war/sngpuss3c------.svg | 28 +- milstd2525/icons/war/sngpuss3t------.svg | 28 +- milstd2525/icons/war/sngpuss4-------.svg | 28 +- milstd2525/icons/war/sngpuss4c------.svg | 28 +- milstd2525/icons/war/sngpuss4t------.svg | 28 +- milstd2525/icons/war/sngpuss5-------.svg | 28 +- milstd2525/icons/war/sngpuss5c------.svg | 28 +- milstd2525/icons/war/sngpuss5t------.svg | 28 +- milstd2525/icons/war/sngpuss6-------.svg | 28 +- milstd2525/icons/war/sngpuss6c------.svg | 28 +- milstd2525/icons/war/sngpuss6t------.svg | 28 +- milstd2525/icons/war/sngpuss7-------.svg | 28 +- milstd2525/icons/war/sngpuss7c------.svg | 28 +- milstd2525/icons/war/sngpuss7t------.svg | 28 +- milstd2525/icons/war/sngpuss8-------.svg | 28 +- milstd2525/icons/war/sngpuss8c------.svg | 28 +- milstd2525/icons/war/sngpuss8t------.svg | 28 +- milstd2525/icons/war/sngpuss9-------.svg | 28 +- milstd2525/icons/war/sngpuss9c------.svg | 28 +- milstd2525/icons/war/sngpuss9t------.svg | 28 +- milstd2525/icons/war/sngpussc-------.svg | 28 +- milstd2525/icons/war/sngpussl-------.svg | 28 +- milstd2525/icons/war/sngpusslc------.svg | 28 +- milstd2525/icons/war/sngpusslt------.svg | 28 +- milstd2525/icons/war/sngpusst-------.svg | 28 +- milstd2525/icons/war/sngpussw-------.svg | 28 +- milstd2525/icons/war/sngpusswc------.svg | 28 +- milstd2525/icons/war/sngpusswp------.svg | 28 +- milstd2525/icons/war/sngpusswpc-----.svg | 28 +- milstd2525/icons/war/sngpusswpt-----.svg | 28 +- milstd2525/icons/war/sngpusswt------.svg | 28 +- milstd2525/icons/war/sngpussx-------.svg | 28 +- milstd2525/icons/war/sngpussxc------.svg | 28 +- milstd2525/icons/war/sngpussxt------.svg | 28 +- milstd2525/icons/war/sngpust--------.svg | 28 +- milstd2525/icons/war/sngpusta-------.svg | 28 +- milstd2525/icons/war/sngpustac------.svg | 28 +- milstd2525/icons/war/sngpustat------.svg | 28 +- milstd2525/icons/war/sngpustc-------.svg | 28 +- milstd2525/icons/war/sngpusti-------.svg | 28 +- milstd2525/icons/war/sngpustic------.svg | 28 +- milstd2525/icons/war/sngpustit------.svg | 28 +- milstd2525/icons/war/sngpustm-------.svg | 28 +- milstd2525/icons/war/sngpustmc------.svg | 28 +- milstd2525/icons/war/sngpustmt------.svg | 28 +- milstd2525/icons/war/sngpustr-------.svg | 28 +- milstd2525/icons/war/sngpustrc------.svg | 28 +- milstd2525/icons/war/sngpustrt------.svg | 28 +- milstd2525/icons/war/sngpusts-------.svg | 28 +- milstd2525/icons/war/sngpustsc------.svg | 28 +- milstd2525/icons/war/sngpustst------.svg | 28 +- milstd2525/icons/war/sngpustt-------.svg | 28 +- milstd2525/icons/war/sngpusx--------.svg | 28 +- milstd2525/icons/war/sngpusxc-------.svg | 28 +- milstd2525/icons/war/sngpusxe-------.svg | 28 +- milstd2525/icons/war/sngpusxec------.svg | 28 +- milstd2525/icons/war/sngpusxet------.svg | 28 +- milstd2525/icons/war/sngpusxh-------.svg | 28 +- milstd2525/icons/war/sngpusxhc------.svg | 28 +- milstd2525/icons/war/sngpusxht------.svg | 28 +- milstd2525/icons/war/sngpusxo-------.svg | 28 +- milstd2525/icons/war/sngpusxoc------.svg | 28 +- milstd2525/icons/war/sngpusxom------.svg | 28 +- milstd2525/icons/war/sngpusxomc-----.svg | 28 +- milstd2525/icons/war/sngpusxomt-----.svg | 28 +- milstd2525/icons/war/sngpusxot------.svg | 28 +- milstd2525/icons/war/sngpusxr-------.svg | 28 +- milstd2525/icons/war/sngpusxrc------.svg | 28 +- milstd2525/icons/war/sngpusxrt------.svg | 28 +- milstd2525/icons/war/sngpusxt-------.svg | 28 +- milstd2525/icons/war/sngpuu---------.svg | 28 +- milstd2525/icons/war/sngpuua--------.svg | 28 +- milstd2525/icons/war/sngpuuab-------.svg | 28 +- milstd2525/icons/war/sngpuuabr------.svg | 28 +- milstd2525/icons/war/sngpuuac-------.svg | 28 +- milstd2525/icons/war/sngpuuacc------.svg | 28 +- milstd2525/icons/war/sngpuuacck-----.svg | 28 +- milstd2525/icons/war/sngpuuaccm-----.svg | 28 +- milstd2525/icons/war/sngpuuacr------.svg | 28 +- milstd2525/icons/war/sngpuuacrs-----.svg | 28 +- milstd2525/icons/war/sngpuuacrw-----.svg | 28 +- milstd2525/icons/war/sngpuuacs------.svg | 28 +- milstd2525/icons/war/sngpuuacsa-----.svg | 28 +- milstd2525/icons/war/sngpuuacsm-----.svg | 28 +- milstd2525/icons/war/sngpuuad-------.svg | 28 +- milstd2525/icons/war/sngpuuan-------.svg | 28 +- milstd2525/icons/war/sngpuue--------.svg | 28 +- milstd2525/icons/war/sngpuui--------.svg | 28 +- milstd2525/icons/war/sngpuul--------.svg | 28 +- milstd2525/icons/war/sngpuulc-------.svg | 28 +- milstd2525/icons/war/sngpuuld-------.svg | 28 +- milstd2525/icons/war/sngpuulf-------.svg | 28 +- milstd2525/icons/war/sngpuulm-------.svg | 28 +- milstd2525/icons/war/sngpuuls-------.svg | 28 +- milstd2525/icons/war/sngpuum--------.svg | 28 +- milstd2525/icons/war/sngpuuma-------.svg | 28 +- milstd2525/icons/war/sngpuumc-------.svg | 28 +- milstd2525/icons/war/sngpuumj-------.svg | 28 +- milstd2525/icons/war/sngpuummo------.svg | 28 +- milstd2525/icons/war/sngpuumo-------.svg | 28 +- milstd2525/icons/war/sngpuumq-------.svg | 28 +- milstd2525/icons/war/sngpuumr-------.svg | 28 +- milstd2525/icons/war/sngpuumrg------.svg | 28 +- milstd2525/icons/war/sngpuumrs------.svg | 28 +- milstd2525/icons/war/sngpuumrss-----.svg | 28 +- milstd2525/icons/war/sngpuumrx------.svg | 28 +- milstd2525/icons/war/sngpuums-------.svg | 28 +- milstd2525/icons/war/sngpuumse------.svg | 28 +- milstd2525/icons/war/sngpuumsea-----.svg | 28 +- milstd2525/icons/war/sngpuumsec-----.svg | 28 +- milstd2525/icons/war/sngpuumsed-----.svg | 28 +- milstd2525/icons/war/sngpuumsei-----.svg | 28 +- milstd2525/icons/war/sngpuumsej-----.svg | 28 +- milstd2525/icons/war/sngpuumset-----.svg | 28 +- milstd2525/icons/war/sngpuumt-------.svg | 28 +- milstd2525/icons/war/sngpuup--------.svg | 28 +- milstd2525/icons/war/sngpuus--------.svg | 28 +- milstd2525/icons/war/sngpuusa-------.svg | 28 +- milstd2525/icons/war/sngpuusc-------.svg | 28 +- milstd2525/icons/war/sngpuuscl------.svg | 28 +- milstd2525/icons/war/sngpuusf-------.svg | 28 +- milstd2525/icons/war/sngpuusm-------.svg | 28 +- milstd2525/icons/war/sngpuusml------.svg | 28 +- milstd2525/icons/war/sngpuusmn------.svg | 28 +- milstd2525/icons/war/sngpuusms------.svg | 28 +- milstd2525/icons/war/sngpuuso-------.svg | 28 +- milstd2525/icons/war/sngpuusr-------.svg | 28 +- milstd2525/icons/war/sngpuusrs------.svg | 28 +- milstd2525/icons/war/sngpuusrt------.svg | 28 +- milstd2525/icons/war/sngpuusrw------.svg | 28 +- milstd2525/icons/war/sngpuuss-------.svg | 28 +- milstd2525/icons/war/sngpuusw-------.svg | 28 +- milstd2525/icons/war/sngpuusx-------.svg | 28 +- milstd2525/icons/war/snpa-----------.svg | 28 +- milstd2525/icons/war/snpal----------.svg | 28 +- milstd2525/icons/war/snpas----------.svg | 28 +- milstd2525/icons/war/snpat----------.svg | 28 +- milstd2525/icons/war/snpav----------.svg | 28 +- milstd2525/icons/war/snpp-----------.svg | 28 +- milstd2525/icons/war/snppl----------.svg | 28 +- milstd2525/icons/war/snpps----------.svg | 28 +- milstd2525/icons/war/snppt----------.svg | 28 +- milstd2525/icons/war/snppv----------.svg | 28 +- milstd2525/icons/war/snsa-----------.svg | 28 +- milstd2525/icons/war/snsac----------.svg | 28 +- milstd2525/icons/war/snsaca---------.svg | 28 +- milstd2525/icons/war/snsacala-------.svg | 28 +- milstd2525/icons/war/snsacalc-------.svg | 28 +- milstd2525/icons/war/snsacals-------.svg | 28 +- milstd2525/icons/war/snsacalsm------.svg | 28 +- milstd2525/icons/war/snsacalst------.svg | 28 +- milstd2525/icons/war/snsacd---------.svg | 28 +- milstd2525/icons/war/snsach---------.svg | 28 +- milstd2525/icons/war/snsacl---------.svg | 28 +- milstd2525/icons/war/snsaclbb-------.svg | 28 +- milstd2525/icons/war/snsaclcc-------.svg | 28 +- milstd2525/icons/war/snsaclcv-------.svg | 28 +- milstd2525/icons/war/snsacldd-------.svg | 28 +- milstd2525/icons/war/snsaclff-------.svg | 28 +- milstd2525/icons/war/snsaclll-------.svg | 28 +- milstd2525/icons/war/snsaclllas-----.svg | 28 +- milstd2525/icons/war/snsaclllmi-----.svg | 28 +- milstd2525/icons/war/snsaclllsu-----.svg | 28 +- milstd2525/icons/war/snsacm---------.svg | 28 +- milstd2525/icons/war/snsacmma-------.svg | 28 +- milstd2525/icons/war/snsacmmh-------.svg | 28 +- milstd2525/icons/war/snsacmml-------.svg | 28 +- milstd2525/icons/war/snsacmms-------.svg | 28 +- milstd2525/icons/war/snsacp---------.svg | 28 +- milstd2525/icons/war/snsacpsb-------.svg | 28 +- milstd2525/icons/war/snsacpsu-------.svg | 28 +- milstd2525/icons/war/snsacpsug------.svg | 28 +- milstd2525/icons/war/snsacpsum------.svg | 28 +- milstd2525/icons/war/snsacpsut------.svg | 28 +- milstd2525/icons/war/snsacu---------.svg | 28 +- milstd2525/icons/war/snsacum--------.svg | 28 +- milstd2525/icons/war/snsacun--------.svg | 28 +- milstd2525/icons/war/snsacur--------.svg | 28 +- milstd2525/icons/war/snsacus--------.svg | 28 +- milstd2525/icons/war/snsag----------.svg | 28 +- milstd2525/icons/war/snsagc---------.svg | 28 +- milstd2525/icons/war/snsagg---------.svg | 28 +- milstd2525/icons/war/snsagt---------.svg | 28 +- milstd2525/icons/war/snsagu---------.svg | 28 +- milstd2525/icons/war/snsan----------.svg | 28 +- milstd2525/icons/war/snsanf---------.svg | 28 +- milstd2525/icons/war/snsanh---------.svg | 28 +- milstd2525/icons/war/snsani---------.svg | 28 +- milstd2525/icons/war/snsanm---------.svg | 28 +- milstd2525/icons/war/snsanr---------.svg | 28 +- milstd2525/icons/war/snsans---------.svg | 28 +- milstd2525/icons/war/snsao----------.svg | 28 +- milstd2525/icons/war/snsaxa---------.svg | 28 +- milstd2525/icons/war/snsaxar--------.svg | 28 +- milstd2525/icons/war/snsaxas--------.svg | 28 +- milstd2525/icons/war/snsaxf---------.svg | 28 +- milstd2525/icons/war/snsaxfdf-------.svg | 28 +- milstd2525/icons/war/snsaxfdr-------.svg | 28 +- milstd2525/icons/war/snsaxftr-------.svg | 28 +- milstd2525/icons/war/snsaxh---------.svg | 28 +- milstd2525/icons/war/snsaxl---------.svg | 28 +- milstd2525/icons/war/snsaxm---------.svg | 28 +- milstd2525/icons/war/snsaxmc--------.svg | 28 +- milstd2525/icons/war/snsaxmf--------.svg | 28 +- milstd2525/icons/war/snsaxmh--------.svg | 28 +- milstd2525/icons/war/snsaxmo--------.svg | 28 +- milstd2525/icons/war/snsaxmp--------.svg | 28 +- milstd2525/icons/war/snsaxmr--------.svg | 28 +- milstd2525/icons/war/snsaxmto-------.svg | 28 +- milstd2525/icons/war/snsaxmtu-------.svg | 28 +- milstd2525/icons/war/snsaxp---------.svg | 28 +- milstd2525/icons/war/snsaxr---------.svg | 28 +- milstd2525/icons/war/snsp-----------.svg | 28 +- milstd2525/icons/war/snspc----------.svg | 28 +- milstd2525/icons/war/snspca---------.svg | 28 +- milstd2525/icons/war/snspcala-------.svg | 28 +- milstd2525/icons/war/snspcalc-------.svg | 28 +- milstd2525/icons/war/snspcals-------.svg | 28 +- milstd2525/icons/war/snspcalsm------.svg | 28 +- milstd2525/icons/war/snspcalst------.svg | 28 +- milstd2525/icons/war/snspcd---------.svg | 28 +- milstd2525/icons/war/snspch---------.svg | 28 +- milstd2525/icons/war/snspcl---------.svg | 28 +- milstd2525/icons/war/snspclbb-------.svg | 28 +- milstd2525/icons/war/snspclcc-------.svg | 28 +- milstd2525/icons/war/snspclcv-------.svg | 28 +- milstd2525/icons/war/snspcldd-------.svg | 28 +- milstd2525/icons/war/snspclff-------.svg | 28 +- milstd2525/icons/war/snspclll-------.svg | 28 +- milstd2525/icons/war/snspclllas-----.svg | 28 +- milstd2525/icons/war/snspclllmi-----.svg | 28 +- milstd2525/icons/war/snspclllsu-----.svg | 28 +- milstd2525/icons/war/snspcm---------.svg | 28 +- milstd2525/icons/war/snspcmma-------.svg | 28 +- milstd2525/icons/war/snspcmmh-------.svg | 28 +- milstd2525/icons/war/snspcmml-------.svg | 28 +- milstd2525/icons/war/snspcmms-------.svg | 28 +- milstd2525/icons/war/snspcp---------.svg | 28 +- milstd2525/icons/war/snspcpsb-------.svg | 28 +- milstd2525/icons/war/snspcpsu-------.svg | 28 +- milstd2525/icons/war/snspcpsug------.svg | 28 +- milstd2525/icons/war/snspcpsum------.svg | 28 +- milstd2525/icons/war/snspcpsut------.svg | 28 +- milstd2525/icons/war/snspcu---------.svg | 28 +- milstd2525/icons/war/snspcum--------.svg | 28 +- milstd2525/icons/war/snspcun--------.svg | 28 +- milstd2525/icons/war/snspcur--------.svg | 28 +- milstd2525/icons/war/snspcus--------.svg | 28 +- milstd2525/icons/war/snspg----------.svg | 28 +- milstd2525/icons/war/snspgc---------.svg | 28 +- milstd2525/icons/war/snspgg---------.svg | 28 +- milstd2525/icons/war/snspgt---------.svg | 28 +- milstd2525/icons/war/snspgu---------.svg | 28 +- milstd2525/icons/war/snspn----------.svg | 28 +- milstd2525/icons/war/snspnf---------.svg | 28 +- milstd2525/icons/war/snspnh---------.svg | 28 +- milstd2525/icons/war/snspni---------.svg | 28 +- milstd2525/icons/war/snspnm---------.svg | 28 +- milstd2525/icons/war/snspnr---------.svg | 28 +- milstd2525/icons/war/snspns---------.svg | 28 +- milstd2525/icons/war/snspo----------.svg | 28 +- milstd2525/icons/war/snspxa---------.svg | 28 +- milstd2525/icons/war/snspxar--------.svg | 28 +- milstd2525/icons/war/snspxas--------.svg | 28 +- milstd2525/icons/war/snspxf---------.svg | 28 +- milstd2525/icons/war/snspxfdf-------.svg | 28 +- milstd2525/icons/war/snspxfdr-------.svg | 28 +- milstd2525/icons/war/snspxftr-------.svg | 28 +- milstd2525/icons/war/snspxh---------.svg | 28 +- milstd2525/icons/war/snspxl---------.svg | 28 +- milstd2525/icons/war/snspxm---------.svg | 28 +- milstd2525/icons/war/snspxmc--------.svg | 28 +- milstd2525/icons/war/snspxmf--------.svg | 28 +- milstd2525/icons/war/snspxmh--------.svg | 28 +- milstd2525/icons/war/snspxmo--------.svg | 28 +- milstd2525/icons/war/snspxmp--------.svg | 28 +- milstd2525/icons/war/snspxmr--------.svg | 28 +- milstd2525/icons/war/snspxmto-------.svg | 28 +- milstd2525/icons/war/snspxmtu-------.svg | 28 +- milstd2525/icons/war/snspxp---------.svg | 28 +- milstd2525/icons/war/snspxr---------.svg | 28 +- milstd2525/icons/war/snua-----------.svg | 28 +- milstd2525/icons/war/snuae----------.svg | 28 +- milstd2525/icons/war/snuand---------.svg | 28 +- milstd2525/icons/war/snuas----------.svg | 28 +- milstd2525/icons/war/snuas1---------.svg | 28 +- milstd2525/icons/war/snuas2---------.svg | 28 +- milstd2525/icons/war/snuas3---------.svg | 28 +- milstd2525/icons/war/snuas4---------.svg | 28 +- milstd2525/icons/war/snuasb---------.svg | 28 +- milstd2525/icons/war/snuasc---------.svg | 28 +- milstd2525/icons/war/snuasca--------.svg | 28 +- milstd2525/icons/war/snuascb--------.svg | 28 +- milstd2525/icons/war/snuascf--------.svg | 28 +- milstd2525/icons/war/snuascg--------.svg | 28 +- milstd2525/icons/war/snuascm--------.svg | 28 +- milstd2525/icons/war/snuasf---------.svg | 28 +- milstd2525/icons/war/snuask---------.svg | 28 +- milstd2525/icons/war/snuasl---------.svg | 28 +- milstd2525/icons/war/snuasn---------.svg | 28 +- milstd2525/icons/war/snuasna--------.svg | 28 +- milstd2525/icons/war/snuasnb--------.svg | 28 +- milstd2525/icons/war/snuasnf--------.svg | 28 +- milstd2525/icons/war/snuasng--------.svg | 28 +- milstd2525/icons/war/snuasnm--------.svg | 28 +- milstd2525/icons/war/snuaso---------.svg | 28 +- milstd2525/icons/war/snuasof--------.svg | 28 +- milstd2525/icons/war/snuasr---------.svg | 28 +- milstd2525/icons/war/snuasu---------.svg | 28 +- milstd2525/icons/war/snuasum--------.svg | 28 +- milstd2525/icons/war/snuasun--------.svg | 28 +- milstd2525/icons/war/snuasus--------.svg | 28 +- milstd2525/icons/war/snuasx---------.svg | 28 +- milstd2525/icons/war/snuav----------.svg | 28 +- milstd2525/icons/war/snuaw----------.svg | 28 +- milstd2525/icons/war/snuawd---------.svg | 28 +- milstd2525/icons/war/snuawdm--------.svg | 28 +- milstd2525/icons/war/snuawdmg-------.svg | 28 +- milstd2525/icons/war/snuawdmm-------.svg | 28 +- milstd2525/icons/war/snuawm---------.svg | 28 +- milstd2525/icons/war/snuawma--------.svg | 28 +- milstd2525/icons/war/snuawmb--------.svg | 28 +- milstd2525/icons/war/snuawmbd-------.svg | 28 +- milstd2525/icons/war/snuawmc--------.svg | 28 +- milstd2525/icons/war/snuawmd--------.svg | 28 +- milstd2525/icons/war/snuawme--------.svg | 28 +- milstd2525/icons/war/snuawmf--------.svg | 28 +- milstd2525/icons/war/snuawmfc-------.svg | 28 +- milstd2525/icons/war/snuawmfd-------.svg | 28 +- milstd2525/icons/war/snuawmfe-------.svg | 28 +- milstd2525/icons/war/snuawmfo-------.svg | 28 +- milstd2525/icons/war/snuawmfr-------.svg | 28 +- milstd2525/icons/war/snuawmfx-------.svg | 28 +- milstd2525/icons/war/snuawmg--------.svg | 28 +- milstd2525/icons/war/snuawmgc-------.svg | 28 +- milstd2525/icons/war/snuawmgd-------.svg | 28 +- milstd2525/icons/war/snuawmge-------.svg | 28 +- milstd2525/icons/war/snuawmgo-------.svg | 28 +- milstd2525/icons/war/snuawmgr-------.svg | 28 +- milstd2525/icons/war/snuawmgx-------.svg | 28 +- milstd2525/icons/war/snuawmm--------.svg | 28 +- milstd2525/icons/war/snuawmmc-------.svg | 28 +- milstd2525/icons/war/snuawmmd-------.svg | 28 +- milstd2525/icons/war/snuawmme-------.svg | 28 +- milstd2525/icons/war/snuawmmo-------.svg | 28 +- milstd2525/icons/war/snuawmmr-------.svg | 28 +- milstd2525/icons/war/snuawmmx-------.svg | 28 +- milstd2525/icons/war/snuawmn--------.svg | 28 +- milstd2525/icons/war/snuawmo--------.svg | 28 +- milstd2525/icons/war/snuawmod-------.svg | 28 +- milstd2525/icons/war/snuawmr--------.svg | 28 +- milstd2525/icons/war/snuawms--------.svg | 28 +- milstd2525/icons/war/snuawmsd-------.svg | 28 +- milstd2525/icons/war/snuawmsx-------.svg | 28 +- milstd2525/icons/war/snuawmx--------.svg | 28 +- milstd2525/icons/war/snuawt---------.svg | 28 +- milstd2525/icons/war/snuax----------.svg | 28 +- milstd2525/icons/war/snup-----------.svg | 28 +- milstd2525/icons/war/snupe----------.svg | 28 +- milstd2525/icons/war/snupnd---------.svg | 28 +- milstd2525/icons/war/snups----------.svg | 28 +- milstd2525/icons/war/snups1---------.svg | 28 +- milstd2525/icons/war/snups2---------.svg | 28 +- milstd2525/icons/war/snups3---------.svg | 28 +- milstd2525/icons/war/snups4---------.svg | 28 +- milstd2525/icons/war/snupsb---------.svg | 28 +- milstd2525/icons/war/snupsc---------.svg | 28 +- milstd2525/icons/war/snupsca--------.svg | 28 +- milstd2525/icons/war/snupscb--------.svg | 28 +- milstd2525/icons/war/snupscf--------.svg | 28 +- milstd2525/icons/war/snupscg--------.svg | 28 +- milstd2525/icons/war/snupscm--------.svg | 28 +- milstd2525/icons/war/snupsf---------.svg | 28 +- milstd2525/icons/war/snupsk---------.svg | 28 +- milstd2525/icons/war/snupsl---------.svg | 28 +- milstd2525/icons/war/snupsn---------.svg | 28 +- milstd2525/icons/war/snupsna--------.svg | 28 +- milstd2525/icons/war/snupsnb--------.svg | 28 +- milstd2525/icons/war/snupsnf--------.svg | 28 +- milstd2525/icons/war/snupsng--------.svg | 28 +- milstd2525/icons/war/snupsnm--------.svg | 28 +- milstd2525/icons/war/snupso---------.svg | 28 +- milstd2525/icons/war/snupsof--------.svg | 28 +- milstd2525/icons/war/snupsr---------.svg | 28 +- milstd2525/icons/war/snupsu---------.svg | 28 +- milstd2525/icons/war/snupsum--------.svg | 28 +- milstd2525/icons/war/snupsun--------.svg | 28 +- milstd2525/icons/war/snupsus--------.svg | 28 +- milstd2525/icons/war/snupsx---------.svg | 28 +- milstd2525/icons/war/snupv----------.svg | 28 +- milstd2525/icons/war/snupw----------.svg | 28 +- milstd2525/icons/war/snupwd---------.svg | 28 +- milstd2525/icons/war/snupwdm--------.svg | 28 +- milstd2525/icons/war/snupwdmg-------.svg | 28 +- milstd2525/icons/war/snupwdmm-------.svg | 28 +- milstd2525/icons/war/snupwm---------.svg | 28 +- milstd2525/icons/war/snupwma--------.svg | 28 +- milstd2525/icons/war/snupwmb--------.svg | 28 +- milstd2525/icons/war/snupwmbd-------.svg | 28 +- milstd2525/icons/war/snupwmc--------.svg | 28 +- milstd2525/icons/war/snupwmd--------.svg | 28 +- milstd2525/icons/war/snupwme--------.svg | 28 +- milstd2525/icons/war/snupwmf--------.svg | 28 +- milstd2525/icons/war/snupwmfc-------.svg | 28 +- milstd2525/icons/war/snupwmfd-------.svg | 28 +- milstd2525/icons/war/snupwmfe-------.svg | 28 +- milstd2525/icons/war/snupwmfo-------.svg | 28 +- milstd2525/icons/war/snupwmfr-------.svg | 28 +- milstd2525/icons/war/snupwmfx-------.svg | 28 +- milstd2525/icons/war/snupwmg--------.svg | 28 +- milstd2525/icons/war/snupwmgc-------.svg | 28 +- milstd2525/icons/war/snupwmgd-------.svg | 28 +- milstd2525/icons/war/snupwmge-------.svg | 28 +- milstd2525/icons/war/snupwmgo-------.svg | 28 +- milstd2525/icons/war/snupwmgr-------.svg | 28 +- milstd2525/icons/war/snupwmgx-------.svg | 28 +- milstd2525/icons/war/snupwmm--------.svg | 28 +- milstd2525/icons/war/snupwmmc-------.svg | 28 +- milstd2525/icons/war/snupwmmd-------.svg | 28 +- milstd2525/icons/war/snupwmme-------.svg | 28 +- milstd2525/icons/war/snupwmmo-------.svg | 28 +- milstd2525/icons/war/snupwmmr-------.svg | 28 +- milstd2525/icons/war/snupwmmx-------.svg | 28 +- milstd2525/icons/war/snupwmn--------.svg | 28 +- milstd2525/icons/war/snupwmo--------.svg | 28 +- milstd2525/icons/war/snupwmod-------.svg | 28 +- milstd2525/icons/war/snupwmr--------.svg | 28 +- milstd2525/icons/war/snupwms--------.svg | 28 +- milstd2525/icons/war/snupwmsd-------.svg | 28 +- milstd2525/icons/war/snupwmsx-------.svg | 28 +- milstd2525/icons/war/snupwmx--------.svg | 28 +- milstd2525/icons/war/snupwt---------.svg | 28 +- milstd2525/icons/war/snupx----------.svg | 28 +- milstd2525/icons/war/suaa-----------.svg | 28 +- milstd2525/icons/war/suaac----------.svg | 28 +- milstd2525/icons/war/suaacf---------.svg | 28 +- milstd2525/icons/war/suaach---------.svg | 28 +- milstd2525/icons/war/suaacl---------.svg | 28 +- milstd2525/icons/war/suaam----------.svg | 28 +- milstd2525/icons/war/suaame---------.svg | 28 +- milstd2525/icons/war/suaamf---------.svg | 28 +- milstd2525/icons/war/suaamfa--------.svg | 28 +- milstd2525/icons/war/suaamfb--------.svg | 28 +- milstd2525/icons/war/suaamfc--------.svg | 28 +- milstd2525/icons/war/suaamfch-------.svg | 28 +- milstd2525/icons/war/suaamfcl-------.svg | 28 +- milstd2525/icons/war/suaamfcm-------.svg | 28 +- milstd2525/icons/war/suaamfd--------.svg | 28 +- milstd2525/icons/war/suaamff--------.svg | 28 +- milstd2525/icons/war/suaamffi-------.svg | 28 +- milstd2525/icons/war/suaamfh--------.svg | 28 +- milstd2525/icons/war/suaamfj--------.svg | 28 +- milstd2525/icons/war/suaamfk--------.svg | 28 +- milstd2525/icons/war/suaamfkb-------.svg | 28 +- milstd2525/icons/war/suaamfkd-------.svg | 28 +- milstd2525/icons/war/suaamfl--------.svg | 28 +- milstd2525/icons/war/suaamfm--------.svg | 28 +- milstd2525/icons/war/suaamfo--------.svg | 28 +- milstd2525/icons/war/suaamfp--------.svg | 28 +- milstd2525/icons/war/suaamfpm-------.svg | 28 +- milstd2525/icons/war/suaamfpn-------.svg | 28 +- milstd2525/icons/war/suaamfq--------.svg | 28 +- milstd2525/icons/war/suaamfqa-------.svg | 28 +- milstd2525/icons/war/suaamfqb-------.svg | 28 +- milstd2525/icons/war/suaamfqc-------.svg | 28 +- milstd2525/icons/war/suaamfqd-------.svg | 28 +- milstd2525/icons/war/suaamfqf-------.svg | 28 +- milstd2525/icons/war/suaamfqh-------.svg | 28 +- milstd2525/icons/war/suaamfqi-------.svg | 28 +- milstd2525/icons/war/suaamfqj-------.svg | 28 +- milstd2525/icons/war/suaamfqk-------.svg | 28 +- milstd2525/icons/war/suaamfql-------.svg | 28 +- milstd2525/icons/war/suaamfqm-------.svg | 28 +- milstd2525/icons/war/suaamfqn-------.svg | 28 +- milstd2525/icons/war/suaamfqo-------.svg | 28 +- milstd2525/icons/war/suaamfqp-------.svg | 28 +- milstd2525/icons/war/suaamfqr-------.svg | 28 +- milstd2525/icons/war/suaamfqrw------.svg | 28 +- milstd2525/icons/war/suaamfqrx------.svg | 28 +- milstd2525/icons/war/suaamfqrz------.svg | 28 +- milstd2525/icons/war/suaamfqs-------.svg | 28 +- milstd2525/icons/war/suaamfqt-------.svg | 28 +- milstd2525/icons/war/suaamfqu-------.svg | 28 +- milstd2525/icons/war/suaamfqy-------.svg | 28 +- milstd2525/icons/war/suaamfr--------.svg | 28 +- milstd2525/icons/war/suaamfrw-------.svg | 28 +- milstd2525/icons/war/suaamfrx-------.svg | 28 +- milstd2525/icons/war/suaamfrz-------.svg | 28 +- milstd2525/icons/war/suaamfs--------.svg | 28 +- milstd2525/icons/war/suaamft--------.svg | 28 +- milstd2525/icons/war/suaamfu--------.svg | 28 +- milstd2525/icons/war/suaamfuh-------.svg | 28 +- milstd2525/icons/war/suaamful-------.svg | 28 +- milstd2525/icons/war/suaamfum-------.svg | 28 +- milstd2525/icons/war/suaamfy--------.svg | 28 +- milstd2525/icons/war/suaamh---------.svg | 28 +- milstd2525/icons/war/suaamha--------.svg | 28 +- milstd2525/icons/war/suaamhc--------.svg | 28 +- milstd2525/icons/war/suaamhch-------.svg | 28 +- milstd2525/icons/war/suaamhcl-------.svg | 28 +- milstd2525/icons/war/suaamhcm-------.svg | 28 +- milstd2525/icons/war/suaamhd--------.svg | 28 +- milstd2525/icons/war/suaamhh--------.svg | 28 +- milstd2525/icons/war/suaamhi--------.svg | 28 +- milstd2525/icons/war/suaamhj--------.svg | 28 +- milstd2525/icons/war/suaamhk--------.svg | 28 +- milstd2525/icons/war/suaamhm--------.svg | 28 +- milstd2525/icons/war/suaamho--------.svg | 28 +- milstd2525/icons/war/suaamhq--------.svg | 28 +- milstd2525/icons/war/suaamhr--------.svg | 28 +- milstd2525/icons/war/suaamhs--------.svg | 28 +- milstd2525/icons/war/suaamht--------.svg | 28 +- milstd2525/icons/war/suaamhu--------.svg | 28 +- milstd2525/icons/war/suaamhuh-------.svg | 28 +- milstd2525/icons/war/suaamhul-------.svg | 28 +- milstd2525/icons/war/suaamhum-------.svg | 28 +- milstd2525/icons/war/suaaml---------.svg | 28 +- milstd2525/icons/war/suaamv---------.svg | 28 +- milstd2525/icons/war/suaaw----------.svg | 28 +- milstd2525/icons/war/suaawb---------.svg | 28 +- milstd2525/icons/war/suaawd---------.svg | 28 +- milstd2525/icons/war/suaawm---------.svg | 28 +- milstd2525/icons/war/suaawma--------.svg | 28 +- milstd2525/icons/war/suaawmaa-------.svg | 28 +- milstd2525/icons/war/suaawmap-------.svg | 28 +- milstd2525/icons/war/suaawmas-------.svg | 28 +- milstd2525/icons/war/suaawmb--------.svg | 28 +- milstd2525/icons/war/suaawmcm-------.svg | 28 +- milstd2525/icons/war/suaawms--------.svg | 28 +- milstd2525/icons/war/suaawmsa-------.svg | 28 +- milstd2525/icons/war/suaawmsb-------.svg | 28 +- milstd2525/icons/war/suaawmss-------.svg | 28 +- milstd2525/icons/war/suaawmsu-------.svg | 28 +- milstd2525/icons/war/suaawmu--------.svg | 28 +- milstd2525/icons/war/suap-----------.svg | 28 +- milstd2525/icons/war/suapc----------.svg | 28 +- milstd2525/icons/war/suapcf---------.svg | 28 +- milstd2525/icons/war/suapch---------.svg | 28 +- milstd2525/icons/war/suapcl---------.svg | 28 +- milstd2525/icons/war/suapm----------.svg | 28 +- milstd2525/icons/war/suapme---------.svg | 28 +- milstd2525/icons/war/suapmf---------.svg | 28 +- milstd2525/icons/war/suapmfa--------.svg | 28 +- milstd2525/icons/war/suapmfb--------.svg | 28 +- milstd2525/icons/war/suapmfc--------.svg | 28 +- milstd2525/icons/war/suapmfch-------.svg | 28 +- milstd2525/icons/war/suapmfcl-------.svg | 28 +- milstd2525/icons/war/suapmfcm-------.svg | 28 +- milstd2525/icons/war/suapmfd--------.svg | 28 +- milstd2525/icons/war/suapmff--------.svg | 28 +- milstd2525/icons/war/suapmffi-------.svg | 28 +- milstd2525/icons/war/suapmfh--------.svg | 28 +- milstd2525/icons/war/suapmfj--------.svg | 28 +- milstd2525/icons/war/suapmfk--------.svg | 28 +- milstd2525/icons/war/suapmfkb-------.svg | 28 +- milstd2525/icons/war/suapmfkd-------.svg | 28 +- milstd2525/icons/war/suapmfl--------.svg | 28 +- milstd2525/icons/war/suapmfm--------.svg | 28 +- milstd2525/icons/war/suapmfo--------.svg | 28 +- milstd2525/icons/war/suapmfp--------.svg | 28 +- milstd2525/icons/war/suapmfpm-------.svg | 28 +- milstd2525/icons/war/suapmfpn-------.svg | 28 +- milstd2525/icons/war/suapmfq--------.svg | 28 +- milstd2525/icons/war/suapmfqa-------.svg | 28 +- milstd2525/icons/war/suapmfqb-------.svg | 28 +- milstd2525/icons/war/suapmfqc-------.svg | 28 +- milstd2525/icons/war/suapmfqd-------.svg | 28 +- milstd2525/icons/war/suapmfqf-------.svg | 28 +- milstd2525/icons/war/suapmfqh-------.svg | 28 +- milstd2525/icons/war/suapmfqi-------.svg | 28 +- milstd2525/icons/war/suapmfqj-------.svg | 28 +- milstd2525/icons/war/suapmfqk-------.svg | 28 +- milstd2525/icons/war/suapmfql-------.svg | 28 +- milstd2525/icons/war/suapmfqm-------.svg | 28 +- milstd2525/icons/war/suapmfqn-------.svg | 28 +- milstd2525/icons/war/suapmfqo-------.svg | 28 +- milstd2525/icons/war/suapmfqp-------.svg | 28 +- milstd2525/icons/war/suapmfqr-------.svg | 28 +- milstd2525/icons/war/suapmfqrw------.svg | 28 +- milstd2525/icons/war/suapmfqrx------.svg | 28 +- milstd2525/icons/war/suapmfqrz------.svg | 28 +- milstd2525/icons/war/suapmfqs-------.svg | 28 +- milstd2525/icons/war/suapmfqt-------.svg | 28 +- milstd2525/icons/war/suapmfqu-------.svg | 28 +- milstd2525/icons/war/suapmfqy-------.svg | 28 +- milstd2525/icons/war/suapmfr--------.svg | 28 +- milstd2525/icons/war/suapmfrw-------.svg | 28 +- milstd2525/icons/war/suapmfrx-------.svg | 28 +- milstd2525/icons/war/suapmfrz-------.svg | 28 +- milstd2525/icons/war/suapmfs--------.svg | 28 +- milstd2525/icons/war/suapmft--------.svg | 28 +- milstd2525/icons/war/suapmfu--------.svg | 28 +- milstd2525/icons/war/suapmfuh-------.svg | 28 +- milstd2525/icons/war/suapmful-------.svg | 28 +- milstd2525/icons/war/suapmfum-------.svg | 28 +- milstd2525/icons/war/suapmfy--------.svg | 28 +- milstd2525/icons/war/suapmh---------.svg | 28 +- milstd2525/icons/war/suapmha--------.svg | 28 +- milstd2525/icons/war/suapmhc--------.svg | 28 +- milstd2525/icons/war/suapmhch-------.svg | 28 +- milstd2525/icons/war/suapmhcl-------.svg | 28 +- milstd2525/icons/war/suapmhcm-------.svg | 28 +- milstd2525/icons/war/suapmhd--------.svg | 28 +- milstd2525/icons/war/suapmhh--------.svg | 28 +- milstd2525/icons/war/suapmhi--------.svg | 28 +- milstd2525/icons/war/suapmhj--------.svg | 28 +- milstd2525/icons/war/suapmhk--------.svg | 28 +- milstd2525/icons/war/suapmhm--------.svg | 28 +- milstd2525/icons/war/suapmho--------.svg | 28 +- milstd2525/icons/war/suapmhq--------.svg | 28 +- milstd2525/icons/war/suapmhr--------.svg | 28 +- milstd2525/icons/war/suapmhs--------.svg | 28 +- milstd2525/icons/war/suapmht--------.svg | 28 +- milstd2525/icons/war/suapmhu--------.svg | 28 +- milstd2525/icons/war/suapmhuh-------.svg | 28 +- milstd2525/icons/war/suapmhul-------.svg | 28 +- milstd2525/icons/war/suapmhum-------.svg | 28 +- milstd2525/icons/war/suapml---------.svg | 28 +- milstd2525/icons/war/suapmv---------.svg | 28 +- milstd2525/icons/war/suapw----------.svg | 28 +- milstd2525/icons/war/suapwb---------.svg | 28 +- milstd2525/icons/war/suapwd---------.svg | 28 +- milstd2525/icons/war/suapwm---------.svg | 28 +- milstd2525/icons/war/suapwma--------.svg | 28 +- milstd2525/icons/war/suapwmaa-------.svg | 28 +- milstd2525/icons/war/suapwmap-------.svg | 28 +- milstd2525/icons/war/suapwmas-------.svg | 28 +- milstd2525/icons/war/suapwmb--------.svg | 28 +- milstd2525/icons/war/suapwmcm-------.svg | 28 +- milstd2525/icons/war/suapwms--------.svg | 28 +- milstd2525/icons/war/suapwmsa-------.svg | 28 +- milstd2525/icons/war/suapwmsb-------.svg | 28 +- milstd2525/icons/war/suapwmss-------.svg | 28 +- milstd2525/icons/war/suapwmsu-------.svg | 28 +- milstd2525/icons/war/suapwmu--------.svg | 28 +- milstd2525/icons/war/sufa-----------.svg | 28 +- milstd2525/icons/war/sufaa----------.svg | 28 +- milstd2525/icons/war/sufaaf---------.svg | 28 +- milstd2525/icons/war/sufaafa--------.svg | 28 +- milstd2525/icons/war/sufaafk--------.svg | 28 +- milstd2525/icons/war/sufaafu--------.svg | 28 +- milstd2525/icons/war/sufaafuh-------.svg | 28 +- milstd2525/icons/war/sufaaful-------.svg | 28 +- milstd2525/icons/war/sufaafum-------.svg | 28 +- milstd2525/icons/war/sufaah---------.svg | 28 +- milstd2525/icons/war/sufaaha--------.svg | 28 +- milstd2525/icons/war/sufaahh--------.svg | 28 +- milstd2525/icons/war/sufaahu--------.svg | 28 +- milstd2525/icons/war/sufaahuh-------.svg | 28 +- milstd2525/icons/war/sufaahul-------.svg | 28 +- milstd2525/icons/war/sufaahum-------.svg | 28 +- milstd2525/icons/war/sufaav---------.svg | 28 +- milstd2525/icons/war/sufab----------.svg | 28 +- milstd2525/icons/war/sufag----------.svg | 28 +- milstd2525/icons/war/sufagc---------.svg | 28 +- milstd2525/icons/war/sufagp---------.svg | 28 +- milstd2525/icons/war/sufagpa--------.svg | 28 +- milstd2525/icons/war/sufagr---------.svg | 28 +- milstd2525/icons/war/sufags---------.svg | 28 +- milstd2525/icons/war/sufan----------.svg | 28 +- milstd2525/icons/war/sufanb---------.svg | 28 +- milstd2525/icons/war/sufann---------.svg | 28 +- milstd2525/icons/war/sufans---------.svg | 28 +- milstd2525/icons/war/sufanu---------.svg | 28 +- milstd2525/icons/war/sufp-----------.svg | 28 +- milstd2525/icons/war/sufpa----------.svg | 28 +- milstd2525/icons/war/sufpaf---------.svg | 28 +- milstd2525/icons/war/sufpafa--------.svg | 28 +- milstd2525/icons/war/sufpafk--------.svg | 28 +- milstd2525/icons/war/sufpafu--------.svg | 28 +- milstd2525/icons/war/sufpafuh-------.svg | 28 +- milstd2525/icons/war/sufpaful-------.svg | 28 +- milstd2525/icons/war/sufpafum-------.svg | 28 +- milstd2525/icons/war/sufpah---------.svg | 28 +- milstd2525/icons/war/sufpaha--------.svg | 28 +- milstd2525/icons/war/sufpahh--------.svg | 28 +- milstd2525/icons/war/sufpahu--------.svg | 28 +- milstd2525/icons/war/sufpahuh-------.svg | 28 +- milstd2525/icons/war/sufpahul-------.svg | 28 +- milstd2525/icons/war/sufpahum-------.svg | 28 +- milstd2525/icons/war/sufpav---------.svg | 28 +- milstd2525/icons/war/sufpb----------.svg | 28 +- milstd2525/icons/war/sufpg----------.svg | 28 +- milstd2525/icons/war/sufpgc---------.svg | 28 +- milstd2525/icons/war/sufpgp---------.svg | 28 +- milstd2525/icons/war/sufpgpa--------.svg | 28 +- milstd2525/icons/war/sufpgr---------.svg | 28 +- milstd2525/icons/war/sufpgs---------.svg | 28 +- milstd2525/icons/war/sufpn----------.svg | 28 +- milstd2525/icons/war/sufpnb---------.svg | 28 +- milstd2525/icons/war/sufpnn---------.svg | 28 +- milstd2525/icons/war/sufpns---------.svg | 28 +- milstd2525/icons/war/sufpnu---------.svg | 28 +- milstd2525/icons/war/suga-----------.svg | 28 +- milstd2525/icons/war/sugae----------.svg | 28 +- milstd2525/icons/war/sugaes---------.svg | 28 +- milstd2525/icons/war/sugaese--------.svg | 28 +- milstd2525/icons/war/sugaesr--------.svg | 28 +- milstd2525/icons/war/sugaev---------.svg | 28 +- milstd2525/icons/war/sugaeva--------.svg | 28 +- milstd2525/icons/war/sugaevaa-------.svg | 28 +- milstd2525/icons/war/sugaevaar------.svg | 28 +- milstd2525/icons/war/sugaevac-------.svg | 28 +- milstd2525/icons/war/sugaevai-------.svg | 28 +- milstd2525/icons/war/sugaeval-------.svg | 28 +- milstd2525/icons/war/sugaevas-------.svg | 28 +- milstd2525/icons/war/sugaevat-------.svg | 28 +- milstd2525/icons/war/sugaevath------.svg | 28 +- milstd2525/icons/war/sugaevathr-----.svg | 28 +- milstd2525/icons/war/sugaevatl------.svg | 28 +- milstd2525/icons/war/sugaevatlr-----.svg | 28 +- milstd2525/icons/war/sugaevatm------.svg | 28 +- milstd2525/icons/war/sugaevatmr-----.svg | 28 +- milstd2525/icons/war/sugaevc--------.svg | 28 +- milstd2525/icons/war/sugaevca-------.svg | 28 +- milstd2525/icons/war/sugaevcah------.svg | 28 +- milstd2525/icons/war/sugaevcal------.svg | 28 +- milstd2525/icons/war/sugaevcam------.svg | 28 +- milstd2525/icons/war/sugaevcf-------.svg | 28 +- milstd2525/icons/war/sugaevcfh------.svg | 28 +- milstd2525/icons/war/sugaevcfl------.svg | 28 +- milstd2525/icons/war/sugaevcfm------.svg | 28 +- milstd2525/icons/war/sugaevcj-------.svg | 28 +- milstd2525/icons/war/sugaevcjh------.svg | 28 +- milstd2525/icons/war/sugaevcjl------.svg | 28 +- milstd2525/icons/war/sugaevcjm------.svg | 28 +- milstd2525/icons/war/sugaevcm-------.svg | 28 +- milstd2525/icons/war/sugaevcmh------.svg | 28 +- milstd2525/icons/war/sugaevcml------.svg | 28 +- milstd2525/icons/war/sugaevcmm------.svg | 28 +- milstd2525/icons/war/sugaevco-------.svg | 28 +- milstd2525/icons/war/sugaevcoh------.svg | 28 +- milstd2525/icons/war/sugaevcol------.svg | 28 +- milstd2525/icons/war/sugaevcom------.svg | 28 +- milstd2525/icons/war/sugaevct-------.svg | 28 +- milstd2525/icons/war/sugaevcth------.svg | 28 +- milstd2525/icons/war/sugaevctl------.svg | 28 +- milstd2525/icons/war/sugaevctm------.svg | 28 +- milstd2525/icons/war/sugaevcu-------.svg | 28 +- milstd2525/icons/war/sugaevcuh------.svg | 28 +- milstd2525/icons/war/sugaevcul------.svg | 28 +- milstd2525/icons/war/sugaevcum------.svg | 28 +- milstd2525/icons/war/sugaeve--------.svg | 28 +- milstd2525/icons/war/sugaevea-------.svg | 28 +- milstd2525/icons/war/sugaeveaa------.svg | 28 +- milstd2525/icons/war/sugaeveat------.svg | 28 +- milstd2525/icons/war/sugaeveb-------.svg | 28 +- milstd2525/icons/war/sugaevec-------.svg | 28 +- milstd2525/icons/war/sugaeved-------.svg | 28 +- milstd2525/icons/war/sugaeveda------.svg | 28 +- milstd2525/icons/war/sugaevee-------.svg | 28 +- milstd2525/icons/war/sugaevef-------.svg | 28 +- milstd2525/icons/war/sugaeveh-------.svg | 28 +- milstd2525/icons/war/sugaevem-------.svg | 28 +- milstd2525/icons/war/sugaeveml------.svg | 28 +- milstd2525/icons/war/sugaevemv------.svg | 28 +- milstd2525/icons/war/sugaever-------.svg | 28 +- milstd2525/icons/war/sugaeves-------.svg | 28 +- milstd2525/icons/war/sugaevm--------.svg | 28 +- milstd2525/icons/war/sugaevs--------.svg | 28 +- milstd2525/icons/war/sugaevsc-------.svg | 28 +- milstd2525/icons/war/sugaevsp-------.svg | 28 +- milstd2525/icons/war/sugaevsr-------.svg | 28 +- milstd2525/icons/war/sugaevst-------.svg | 28 +- milstd2525/icons/war/sugaevsw-------.svg | 28 +- milstd2525/icons/war/sugaevt--------.svg | 28 +- milstd2525/icons/war/sugaevu--------.svg | 28 +- milstd2525/icons/war/sugaevua-------.svg | 28 +- milstd2525/icons/war/sugaevuaa------.svg | 28 +- milstd2525/icons/war/sugaevub-------.svg | 28 +- milstd2525/icons/war/sugaevul-------.svg | 28 +- milstd2525/icons/war/sugaevur-------.svg | 28 +- milstd2525/icons/war/sugaevus-------.svg | 28 +- milstd2525/icons/war/sugaevush------.svg | 28 +- milstd2525/icons/war/sugaevusl------.svg | 28 +- milstd2525/icons/war/sugaevusm------.svg | 28 +- milstd2525/icons/war/sugaevut-------.svg | 28 +- milstd2525/icons/war/sugaevuth------.svg | 28 +- milstd2525/icons/war/sugaevutl------.svg | 28 +- milstd2525/icons/war/sugaevux-------.svg | 28 +- milstd2525/icons/war/sugaewa--------.svg | 28 +- milstd2525/icons/war/sugaewah-------.svg | 28 +- milstd2525/icons/war/sugaewal-------.svg | 28 +- milstd2525/icons/war/sugaewam-------.svg | 28 +- milstd2525/icons/war/sugaewd--------.svg | 28 +- milstd2525/icons/war/sugaewdh-------.svg | 28 +- milstd2525/icons/war/sugaewdhs------.svg | 28 +- milstd2525/icons/war/sugaewdl-------.svg | 28 +- milstd2525/icons/war/sugaewdls------.svg | 28 +- milstd2525/icons/war/sugaewdm-------.svg | 28 +- milstd2525/icons/war/sugaewdms------.svg | 28 +- milstd2525/icons/war/sugaewg--------.svg | 28 +- milstd2525/icons/war/sugaewgh-------.svg | 28 +- milstd2525/icons/war/sugaewgl-------.svg | 28 +- milstd2525/icons/war/sugaewgm-------.svg | 28 +- milstd2525/icons/war/sugaewgr-------.svg | 28 +- milstd2525/icons/war/sugaewh--------.svg | 28 +- milstd2525/icons/war/sugaewhh-------.svg | 28 +- milstd2525/icons/war/sugaewhhs------.svg | 28 +- milstd2525/icons/war/sugaewhl-------.svg | 28 +- milstd2525/icons/war/sugaewhls------.svg | 28 +- milstd2525/icons/war/sugaewhm-------.svg | 28 +- milstd2525/icons/war/sugaewhms------.svg | 28 +- milstd2525/icons/war/sugaewm--------.svg | 28 +- milstd2525/icons/war/sugaewma-------.svg | 28 +- milstd2525/icons/war/sugaewmai------.svg | 28 +- milstd2525/icons/war/sugaewmaie-----.svg | 28 +- milstd2525/icons/war/sugaewmair-----.svg | 28 +- milstd2525/icons/war/sugaewmal------.svg | 28 +- milstd2525/icons/war/sugaewmale-----.svg | 28 +- milstd2525/icons/war/sugaewmalr-----.svg | 28 +- milstd2525/icons/war/sugaewmas------.svg | 28 +- milstd2525/icons/war/sugaewmase-----.svg | 28 +- milstd2525/icons/war/sugaewmasr-----.svg | 28 +- milstd2525/icons/war/sugaewmat------.svg | 28 +- milstd2525/icons/war/sugaewmate-----.svg | 28 +- milstd2525/icons/war/sugaewmatr-----.svg | 28 +- milstd2525/icons/war/sugaewms-------.svg | 28 +- milstd2525/icons/war/sugaewmsi------.svg | 28 +- milstd2525/icons/war/sugaewmsl------.svg | 28 +- milstd2525/icons/war/sugaewmss------.svg | 28 +- milstd2525/icons/war/sugaewmt-------.svg | 28 +- milstd2525/icons/war/sugaewmth------.svg | 28 +- milstd2525/icons/war/sugaewmtl------.svg | 28 +- milstd2525/icons/war/sugaewmtm------.svg | 28 +- milstd2525/icons/war/sugaewo--------.svg | 28 +- milstd2525/icons/war/sugaewoh-------.svg | 28 +- milstd2525/icons/war/sugaewol-------.svg | 28 +- milstd2525/icons/war/sugaewom-------.svg | 28 +- milstd2525/icons/war/sugaewr--------.svg | 28 +- milstd2525/icons/war/sugaewrh-------.svg | 28 +- milstd2525/icons/war/sugaewrl-------.svg | 28 +- milstd2525/icons/war/sugaewrr-------.svg | 28 +- milstd2525/icons/war/sugaews--------.svg | 28 +- milstd2525/icons/war/sugaewsh-------.svg | 28 +- milstd2525/icons/war/sugaewsl-------.svg | 28 +- milstd2525/icons/war/sugaewsm-------.svg | 28 +- milstd2525/icons/war/sugaewt--------.svg | 28 +- milstd2525/icons/war/sugaewth-------.svg | 28 +- milstd2525/icons/war/sugaewtl-------.svg | 28 +- milstd2525/icons/war/sugaewtm-------.svg | 28 +- milstd2525/icons/war/sugaewx--------.svg | 28 +- milstd2525/icons/war/sugaewxh-------.svg | 28 +- milstd2525/icons/war/sugaewxl-------.svg | 28 +- milstd2525/icons/war/sugaewxm-------.svg | 28 +- milstd2525/icons/war/sugaewz--------.svg | 28 +- milstd2525/icons/war/sugaewzh-------.svg | 28 +- milstd2525/icons/war/sugaewzl-------.svg | 28 +- milstd2525/icons/war/sugaewzm-------.svg | 28 +- milstd2525/icons/war/sugaexf--------.svg | 28 +- milstd2525/icons/war/sugaexi--------.svg | 28 +- milstd2525/icons/war/sugaexl--------.svg | 28 +- milstd2525/icons/war/sugaexm--------.svg | 28 +- milstd2525/icons/war/sugaexmc-------.svg | 28 +- milstd2525/icons/war/sugaexml-------.svg | 28 +- milstd2525/icons/war/sugaexn--------.svg | 28 +- milstd2525/icons/war/sugai----------.svg | 28 +- milstd2525/icons/war/sugaib---------.svg | 28 +- milstd2525/icons/war/sugaiba--------.svg | 28 +- milstd2525/icons/war/sugaibn--------.svg | 28 +- milstd2525/icons/war/sugaie---------.svg | 28 +- milstd2525/icons/war/sugaig---------.svg | 28 +- milstd2525/icons/war/sugaima--------.svg | 28 +- milstd2525/icons/war/sugaimc--------.svg | 28 +- milstd2525/icons/war/sugaime--------.svg | 28 +- milstd2525/icons/war/sugaimf--------.svg | 28 +- milstd2525/icons/war/sugaimfa-------.svg | 28 +- milstd2525/icons/war/sugaimfp-------.svg | 28 +- milstd2525/icons/war/sugaimfpw------.svg | 28 +- milstd2525/icons/war/sugaimfs-------.svg | 28 +- milstd2525/icons/war/sugaimg--------.svg | 28 +- milstd2525/icons/war/sugaimm--------.svg | 28 +- milstd2525/icons/war/sugaimn--------.svg | 28 +- milstd2525/icons/war/sugaimnb-------.svg | 28 +- milstd2525/icons/war/sugaims--------.svg | 28 +- milstd2525/icons/war/sugaimv--------.svg | 28 +- milstd2525/icons/war/sugaip---------.svg | 28 +- milstd2525/icons/war/sugaipd--------.svg | 28 +- milstd2525/icons/war/sugair---------.svg | 28 +- milstd2525/icons/war/sugairm--------.svg | 28 +- milstd2525/icons/war/sugairn--------.svg | 28 +- milstd2525/icons/war/sugairnb-------.svg | 28 +- milstd2525/icons/war/sugairnc-------.svg | 28 +- milstd2525/icons/war/sugairnn-------.svg | 28 +- milstd2525/icons/war/sugairp--------.svg | 28 +- milstd2525/icons/war/sugait---------.svg | 28 +- milstd2525/icons/war/sugaiu---------.svg | 28 +- milstd2525/icons/war/sugaiue--------.svg | 28 +- milstd2525/icons/war/sugaiued-------.svg | 28 +- milstd2525/icons/war/sugaiuef-------.svg | 28 +- milstd2525/icons/war/sugaiuen-------.svg | 28 +- milstd2525/icons/war/sugaiup--------.svg | 28 +- milstd2525/icons/war/sugaiur--------.svg | 28 +- milstd2525/icons/war/sugaiut--------.svg | 28 +- milstd2525/icons/war/sugaix---------.svg | 28 +- milstd2525/icons/war/sugaixh--------.svg | 28 +- milstd2525/icons/war/sugau----------.svg | 28 +- milstd2525/icons/war/sugauc---------.svg | 28 +- milstd2525/icons/war/sugauca--------.svg | 28 +- milstd2525/icons/war/sugaucaa-------.svg | 28 +- milstd2525/icons/war/sugaucaaa------.svg | 28 +- milstd2525/icons/war/sugaucaaas-----.svg | 28 +- milstd2525/icons/war/sugaucaaat-----.svg | 28 +- milstd2525/icons/war/sugaucaaaw-----.svg | 28 +- milstd2525/icons/war/sugaucaac------.svg | 28 +- milstd2525/icons/war/sugaucaad------.svg | 28 +- milstd2525/icons/war/sugaucaal------.svg | 28 +- milstd2525/icons/war/sugaucaam------.svg | 28 +- milstd2525/icons/war/sugaucaao------.svg | 28 +- milstd2525/icons/war/sugaucaaos-----.svg | 28 +- milstd2525/icons/war/sugaucaas------.svg | 28 +- milstd2525/icons/war/sugaucaau------.svg | 28 +- milstd2525/icons/war/sugaucat-------.svg | 28 +- milstd2525/icons/war/sugaucata------.svg | 28 +- milstd2525/icons/war/sugaucath------.svg | 28 +- milstd2525/icons/war/sugaucatl------.svg | 28 +- milstd2525/icons/war/sugaucatm------.svg | 28 +- milstd2525/icons/war/sugaucatr------.svg | 28 +- milstd2525/icons/war/sugaucatw------.svg | 28 +- milstd2525/icons/war/sugaucatwr-----.svg | 28 +- milstd2525/icons/war/sugaucaw-------.svg | 28 +- milstd2525/icons/war/sugaucawa------.svg | 28 +- milstd2525/icons/war/sugaucawh------.svg | 28 +- milstd2525/icons/war/sugaucawl------.svg | 28 +- milstd2525/icons/war/sugaucawm------.svg | 28 +- milstd2525/icons/war/sugaucawr------.svg | 28 +- milstd2525/icons/war/sugaucaws------.svg | 28 +- milstd2525/icons/war/sugaucaww------.svg | 28 +- milstd2525/icons/war/sugaucawwr-----.svg | 28 +- milstd2525/icons/war/sugaucd--------.svg | 28 +- milstd2525/icons/war/sugaucdc-------.svg | 28 +- milstd2525/icons/war/sugaucdg-------.svg | 28 +- milstd2525/icons/war/sugaucdh-------.svg | 28 +- milstd2525/icons/war/sugaucdhh------.svg | 28 +- milstd2525/icons/war/sugaucdhp------.svg | 28 +- milstd2525/icons/war/sugaucdm-------.svg | 28 +- milstd2525/icons/war/sugaucdmh------.svg | 28 +- milstd2525/icons/war/sugaucdml------.svg | 28 +- milstd2525/icons/war/sugaucdmla-----.svg | 28 +- milstd2525/icons/war/sugaucdmm------.svg | 28 +- milstd2525/icons/war/sugaucdo-------.svg | 28 +- milstd2525/icons/war/sugaucds-------.svg | 28 +- milstd2525/icons/war/sugaucdsc------.svg | 28 +- milstd2525/icons/war/sugaucdss------.svg | 28 +- milstd2525/icons/war/sugaucdsv------.svg | 28 +- milstd2525/icons/war/sugaucdt-------.svg | 28 +- milstd2525/icons/war/sugauce--------.svg | 28 +- milstd2525/icons/war/sugaucec-------.svg | 28 +- milstd2525/icons/war/sugauceca------.svg | 28 +- milstd2525/icons/war/sugaucecc------.svg | 28 +- milstd2525/icons/war/sugaucech------.svg | 28 +- milstd2525/icons/war/sugaucecl------.svg | 28 +- milstd2525/icons/war/sugaucecm------.svg | 28 +- milstd2525/icons/war/sugauceco------.svg | 28 +- milstd2525/icons/war/sugaucecr------.svg | 28 +- milstd2525/icons/war/sugaucecs------.svg | 28 +- milstd2525/icons/war/sugaucect------.svg | 28 +- milstd2525/icons/war/sugaucecw------.svg | 28 +- milstd2525/icons/war/sugaucen-------.svg | 28 +- milstd2525/icons/war/sugaucenn------.svg | 28 +- milstd2525/icons/war/sugaucf--------.svg | 28 +- milstd2525/icons/war/sugaucfh-------.svg | 28 +- milstd2525/icons/war/sugaucfha------.svg | 28 +- milstd2525/icons/war/sugaucfhc------.svg | 28 +- milstd2525/icons/war/sugaucfhe------.svg | 28 +- milstd2525/icons/war/sugaucfhh------.svg | 28 +- milstd2525/icons/war/sugaucfhl------.svg | 28 +- milstd2525/icons/war/sugaucfhm------.svg | 28 +- milstd2525/icons/war/sugaucfho------.svg | 28 +- milstd2525/icons/war/sugaucfhs------.svg | 28 +- milstd2525/icons/war/sugaucfhx------.svg | 28 +- milstd2525/icons/war/sugaucfm-------.svg | 28 +- milstd2525/icons/war/sugaucfml------.svg | 28 +- milstd2525/icons/war/sugaucfms------.svg | 28 +- milstd2525/icons/war/sugaucfmt------.svg | 28 +- milstd2525/icons/war/sugaucfmta-----.svg | 28 +- milstd2525/icons/war/sugaucfmtc-----.svg | 28 +- milstd2525/icons/war/sugaucfmto-----.svg | 28 +- milstd2525/icons/war/sugaucfmts-----.svg | 28 +- milstd2525/icons/war/sugaucfmw------.svg | 28 +- milstd2525/icons/war/sugaucfo-------.svg | 28 +- milstd2525/icons/war/sugaucfoa------.svg | 28 +- milstd2525/icons/war/sugaucfol------.svg | 28 +- milstd2525/icons/war/sugaucfoo------.svg | 28 +- milstd2525/icons/war/sugaucfos------.svg | 28 +- milstd2525/icons/war/sugaucfr-------.svg | 28 +- milstd2525/icons/war/sugaucfrm------.svg | 28 +- milstd2525/icons/war/sugaucfrmr-----.svg | 28 +- milstd2525/icons/war/sugaucfrms-----.svg | 28 +- milstd2525/icons/war/sugaucfrmt-----.svg | 28 +- milstd2525/icons/war/sugaucfrs------.svg | 28 +- milstd2525/icons/war/sugaucfrsr-----.svg | 28 +- milstd2525/icons/war/sugaucfrss-----.svg | 28 +- milstd2525/icons/war/sugaucfrst-----.svg | 28 +- milstd2525/icons/war/sugaucfs-------.svg | 28 +- milstd2525/icons/war/sugaucfsa------.svg | 28 +- milstd2525/icons/war/sugaucfsl------.svg | 28 +- milstd2525/icons/war/sugaucfso------.svg | 28 +- milstd2525/icons/war/sugaucfss------.svg | 28 +- milstd2525/icons/war/sugaucft-------.svg | 28 +- milstd2525/icons/war/sugaucfta------.svg | 28 +- milstd2525/icons/war/sugaucftc------.svg | 28 +- milstd2525/icons/war/sugaucftcd-----.svg | 28 +- milstd2525/icons/war/sugaucftcm-----.svg | 28 +- milstd2525/icons/war/sugaucftf------.svg | 28 +- milstd2525/icons/war/sugaucftr------.svg | 28 +- milstd2525/icons/war/sugaucfts------.svg | 28 +- milstd2525/icons/war/sugauci--------.svg | 28 +- milstd2525/icons/war/sugaucia-------.svg | 28 +- milstd2525/icons/war/sugaucic-------.svg | 28 +- milstd2525/icons/war/sugaucii-------.svg | 28 +- milstd2525/icons/war/sugaucil-------.svg | 28 +- milstd2525/icons/war/sugaucim-------.svg | 28 +- milstd2525/icons/war/sugaucin-------.svg | 28 +- milstd2525/icons/war/sugaucio-------.svg | 28 +- milstd2525/icons/war/sugaucis-------.svg | 28 +- milstd2525/icons/war/sugauciz-------.svg | 28 +- milstd2525/icons/war/sugaucm--------.svg | 28 +- milstd2525/icons/war/sugaucms-------.svg | 28 +- milstd2525/icons/war/sugaucmt-------.svg | 28 +- milstd2525/icons/war/sugaucr--------.svg | 28 +- milstd2525/icons/war/sugaucra-------.svg | 28 +- milstd2525/icons/war/sugaucrc-------.svg | 28 +- milstd2525/icons/war/sugaucrh-------.svg | 28 +- milstd2525/icons/war/sugaucrl-------.svg | 28 +- milstd2525/icons/war/sugaucro-------.svg | 28 +- milstd2525/icons/war/sugaucrr-------.svg | 28 +- milstd2525/icons/war/sugaucrrd------.svg | 28 +- milstd2525/icons/war/sugaucrrf------.svg | 28 +- milstd2525/icons/war/sugaucrrl------.svg | 28 +- milstd2525/icons/war/sugaucrs-------.svg | 28 +- milstd2525/icons/war/sugaucrv-------.svg | 28 +- milstd2525/icons/war/sugaucrva------.svg | 28 +- milstd2525/icons/war/sugaucrvg------.svg | 28 +- milstd2525/icons/war/sugaucrvm------.svg | 28 +- milstd2525/icons/war/sugaucrvo------.svg | 28 +- milstd2525/icons/war/sugaucrx-------.svg | 28 +- milstd2525/icons/war/sugaucs--------.svg | 28 +- milstd2525/icons/war/sugaucsa-------.svg | 28 +- milstd2525/icons/war/sugaucsg-------.svg | 28 +- milstd2525/icons/war/sugaucsga------.svg | 28 +- milstd2525/icons/war/sugaucsgd------.svg | 28 +- milstd2525/icons/war/sugaucsgm------.svg | 28 +- milstd2525/icons/war/sugaucsm-------.svg | 28 +- milstd2525/icons/war/sugaucsr-------.svg | 28 +- milstd2525/icons/war/sugaucsw-------.svg | 28 +- milstd2525/icons/war/sugaucv--------.svg | 28 +- milstd2525/icons/war/sugaucvc-------.svg | 28 +- milstd2525/icons/war/sugaucvf-------.svg | 28 +- milstd2525/icons/war/sugaucvfa------.svg | 28 +- milstd2525/icons/war/sugaucvfr------.svg | 28 +- milstd2525/icons/war/sugaucvfu------.svg | 28 +- milstd2525/icons/war/sugaucvr-------.svg | 28 +- milstd2525/icons/war/sugaucvra------.svg | 28 +- milstd2525/icons/war/sugaucvrm------.svg | 28 +- milstd2525/icons/war/sugaucvrs------.svg | 28 +- milstd2525/icons/war/sugaucvru------.svg | 28 +- milstd2525/icons/war/sugaucvruc-----.svg | 28 +- milstd2525/icons/war/sugaucvrue-----.svg | 28 +- milstd2525/icons/war/sugaucvruh-----.svg | 28 +- milstd2525/icons/war/sugaucvrul-----.svg | 28 +- milstd2525/icons/war/sugaucvrum-----.svg | 28 +- milstd2525/icons/war/sugaucvrw------.svg | 28 +- milstd2525/icons/war/sugaucvs-------.svg | 28 +- milstd2525/icons/war/sugaucvu-------.svg | 28 +- milstd2525/icons/war/sugaucvuf------.svg | 28 +- milstd2525/icons/war/sugaucvur------.svg | 28 +- milstd2525/icons/war/sugaucvv-------.svg | 28 +- milstd2525/icons/war/sugauh---------.svg | 28 +- milstd2525/icons/war/sugaus---------.svg | 28 +- milstd2525/icons/war/sugausa--------.svg | 28 +- milstd2525/icons/war/sugausac-------.svg | 28 +- milstd2525/icons/war/sugausaf-------.svg | 28 +- milstd2525/icons/war/sugausafc------.svg | 28 +- milstd2525/icons/war/sugausaft------.svg | 28 +- milstd2525/icons/war/sugausaj-------.svg | 28 +- milstd2525/icons/war/sugausajc------.svg | 28 +- milstd2525/icons/war/sugausajt------.svg | 28 +- milstd2525/icons/war/sugausal-------.svg | 28 +- milstd2525/icons/war/sugausalc------.svg | 28 +- milstd2525/icons/war/sugausalt------.svg | 28 +- milstd2525/icons/war/sugausam-------.svg | 28 +- milstd2525/icons/war/sugausamc------.svg | 28 +- milstd2525/icons/war/sugausamt------.svg | 28 +- milstd2525/icons/war/sugausao-------.svg | 28 +- milstd2525/icons/war/sugausaoc------.svg | 28 +- milstd2525/icons/war/sugausaot------.svg | 28 +- milstd2525/icons/war/sugausap-------.svg | 28 +- milstd2525/icons/war/sugausapb------.svg | 28 +- milstd2525/icons/war/sugausapbc-----.svg | 28 +- milstd2525/icons/war/sugausapbt-----.svg | 28 +- milstd2525/icons/war/sugausapc------.svg | 28 +- milstd2525/icons/war/sugausapm------.svg | 28 +- milstd2525/icons/war/sugausapmc-----.svg | 28 +- milstd2525/icons/war/sugausapmt-----.svg | 28 +- milstd2525/icons/war/sugausapt------.svg | 28 +- milstd2525/icons/war/sugausaq-------.svg | 28 +- milstd2525/icons/war/sugausaqc------.svg | 28 +- milstd2525/icons/war/sugausaqt------.svg | 28 +- milstd2525/icons/war/sugausar-------.svg | 28 +- milstd2525/icons/war/sugausarc------.svg | 28 +- milstd2525/icons/war/sugausart------.svg | 28 +- milstd2525/icons/war/sugausas-------.svg | 28 +- milstd2525/icons/war/sugausasc------.svg | 28 +- milstd2525/icons/war/sugausast------.svg | 28 +- milstd2525/icons/war/sugausat-------.svg | 28 +- milstd2525/icons/war/sugausaw-------.svg | 28 +- milstd2525/icons/war/sugausawc------.svg | 28 +- milstd2525/icons/war/sugausawt------.svg | 28 +- milstd2525/icons/war/sugausax-------.svg | 28 +- milstd2525/icons/war/sugausaxc------.svg | 28 +- milstd2525/icons/war/sugausaxt------.svg | 28 +- milstd2525/icons/war/sugausm--------.svg | 28 +- milstd2525/icons/war/sugausmc-------.svg | 28 +- milstd2525/icons/war/sugausmd-------.svg | 28 +- milstd2525/icons/war/sugausmdc------.svg | 28 +- milstd2525/icons/war/sugausmdt------.svg | 28 +- milstd2525/icons/war/sugausmm-------.svg | 28 +- milstd2525/icons/war/sugausmmc------.svg | 28 +- milstd2525/icons/war/sugausmmt------.svg | 28 +- milstd2525/icons/war/sugausmp-------.svg | 28 +- milstd2525/icons/war/sugausmpc------.svg | 28 +- milstd2525/icons/war/sugausmpt------.svg | 28 +- milstd2525/icons/war/sugausmt-------.svg | 28 +- milstd2525/icons/war/sugausmv-------.svg | 28 +- milstd2525/icons/war/sugausmvc------.svg | 28 +- milstd2525/icons/war/sugausmvt------.svg | 28 +- milstd2525/icons/war/sugauss--------.svg | 28 +- milstd2525/icons/war/sugauss1-------.svg | 28 +- milstd2525/icons/war/sugauss1c------.svg | 28 +- milstd2525/icons/war/sugauss1t------.svg | 28 +- milstd2525/icons/war/sugauss2-------.svg | 28 +- milstd2525/icons/war/sugauss2c------.svg | 28 +- milstd2525/icons/war/sugauss2t------.svg | 28 +- milstd2525/icons/war/sugauss3-------.svg | 28 +- milstd2525/icons/war/sugauss3a------.svg | 28 +- milstd2525/icons/war/sugauss3ac-----.svg | 28 +- milstd2525/icons/war/sugauss3at-----.svg | 28 +- milstd2525/icons/war/sugauss3c------.svg | 28 +- milstd2525/icons/war/sugauss3t------.svg | 28 +- milstd2525/icons/war/sugauss4-------.svg | 28 +- milstd2525/icons/war/sugauss4c------.svg | 28 +- milstd2525/icons/war/sugauss4t------.svg | 28 +- milstd2525/icons/war/sugauss5-------.svg | 28 +- milstd2525/icons/war/sugauss5c------.svg | 28 +- milstd2525/icons/war/sugauss5t------.svg | 28 +- milstd2525/icons/war/sugauss6-------.svg | 28 +- milstd2525/icons/war/sugauss6c------.svg | 28 +- milstd2525/icons/war/sugauss6t------.svg | 28 +- milstd2525/icons/war/sugauss7-------.svg | 28 +- milstd2525/icons/war/sugauss7c------.svg | 28 +- milstd2525/icons/war/sugauss7t------.svg | 28 +- milstd2525/icons/war/sugauss8-------.svg | 28 +- milstd2525/icons/war/sugauss8c------.svg | 28 +- milstd2525/icons/war/sugauss8t------.svg | 28 +- milstd2525/icons/war/sugauss9-------.svg | 28 +- milstd2525/icons/war/sugauss9c------.svg | 28 +- milstd2525/icons/war/sugauss9t------.svg | 28 +- milstd2525/icons/war/sugaussc-------.svg | 28 +- milstd2525/icons/war/sugaussl-------.svg | 28 +- milstd2525/icons/war/sugausslc------.svg | 28 +- milstd2525/icons/war/sugausslt------.svg | 28 +- milstd2525/icons/war/sugausst-------.svg | 28 +- milstd2525/icons/war/sugaussw-------.svg | 28 +- milstd2525/icons/war/sugausswc------.svg | 28 +- milstd2525/icons/war/sugausswp------.svg | 28 +- milstd2525/icons/war/sugausswpc-----.svg | 28 +- milstd2525/icons/war/sugausswpt-----.svg | 28 +- milstd2525/icons/war/sugausswt------.svg | 28 +- milstd2525/icons/war/sugaussx-------.svg | 28 +- milstd2525/icons/war/sugaussxc------.svg | 28 +- milstd2525/icons/war/sugaussxt------.svg | 28 +- milstd2525/icons/war/sugaust--------.svg | 28 +- milstd2525/icons/war/sugausta-------.svg | 28 +- milstd2525/icons/war/sugaustac------.svg | 28 +- milstd2525/icons/war/sugaustat------.svg | 28 +- milstd2525/icons/war/sugaustc-------.svg | 28 +- milstd2525/icons/war/sugausti-------.svg | 28 +- milstd2525/icons/war/sugaustic------.svg | 28 +- milstd2525/icons/war/sugaustit------.svg | 28 +- milstd2525/icons/war/sugaustm-------.svg | 28 +- milstd2525/icons/war/sugaustmc------.svg | 28 +- milstd2525/icons/war/sugaustmt------.svg | 28 +- milstd2525/icons/war/sugaustr-------.svg | 28 +- milstd2525/icons/war/sugaustrc------.svg | 28 +- milstd2525/icons/war/sugaustrt------.svg | 28 +- milstd2525/icons/war/sugausts-------.svg | 28 +- milstd2525/icons/war/sugaustsc------.svg | 28 +- milstd2525/icons/war/sugaustst------.svg | 28 +- milstd2525/icons/war/sugaustt-------.svg | 28 +- milstd2525/icons/war/sugausx--------.svg | 28 +- milstd2525/icons/war/sugausxc-------.svg | 28 +- milstd2525/icons/war/sugausxe-------.svg | 28 +- milstd2525/icons/war/sugausxec------.svg | 28 +- milstd2525/icons/war/sugausxet------.svg | 28 +- milstd2525/icons/war/sugausxh-------.svg | 28 +- milstd2525/icons/war/sugausxhc------.svg | 28 +- milstd2525/icons/war/sugausxht------.svg | 28 +- milstd2525/icons/war/sugausxo-------.svg | 28 +- milstd2525/icons/war/sugausxoc------.svg | 28 +- milstd2525/icons/war/sugausxom------.svg | 28 +- milstd2525/icons/war/sugausxomc-----.svg | 28 +- milstd2525/icons/war/sugausxomt-----.svg | 28 +- milstd2525/icons/war/sugausxot------.svg | 28 +- milstd2525/icons/war/sugausxr-------.svg | 28 +- milstd2525/icons/war/sugausxrc------.svg | 28 +- milstd2525/icons/war/sugausxrt------.svg | 28 +- milstd2525/icons/war/sugausxt-------.svg | 28 +- milstd2525/icons/war/sugauu---------.svg | 28 +- milstd2525/icons/war/sugauua--------.svg | 28 +- milstd2525/icons/war/sugauuab-------.svg | 28 +- milstd2525/icons/war/sugauuabr------.svg | 28 +- milstd2525/icons/war/sugauuac-------.svg | 28 +- milstd2525/icons/war/sugauuacc------.svg | 28 +- milstd2525/icons/war/sugauuacck-----.svg | 28 +- milstd2525/icons/war/sugauuaccm-----.svg | 28 +- milstd2525/icons/war/sugauuacr------.svg | 28 +- milstd2525/icons/war/sugauuacrs-----.svg | 28 +- milstd2525/icons/war/sugauuacrw-----.svg | 28 +- milstd2525/icons/war/sugauuacs------.svg | 28 +- milstd2525/icons/war/sugauuacsa-----.svg | 28 +- milstd2525/icons/war/sugauuacsm-----.svg | 28 +- milstd2525/icons/war/sugauuad-------.svg | 28 +- milstd2525/icons/war/sugauuan-------.svg | 28 +- milstd2525/icons/war/sugauue--------.svg | 28 +- milstd2525/icons/war/sugauui--------.svg | 28 +- milstd2525/icons/war/sugauul--------.svg | 28 +- milstd2525/icons/war/sugauulc-------.svg | 28 +- milstd2525/icons/war/sugauuld-------.svg | 28 +- milstd2525/icons/war/sugauulf-------.svg | 28 +- milstd2525/icons/war/sugauulm-------.svg | 28 +- milstd2525/icons/war/sugauuls-------.svg | 28 +- milstd2525/icons/war/sugauum--------.svg | 28 +- milstd2525/icons/war/sugauuma-------.svg | 28 +- milstd2525/icons/war/sugauumc-------.svg | 28 +- milstd2525/icons/war/sugauumj-------.svg | 28 +- milstd2525/icons/war/sugauummo------.svg | 28 +- milstd2525/icons/war/sugauumo-------.svg | 28 +- milstd2525/icons/war/sugauumq-------.svg | 28 +- milstd2525/icons/war/sugauumr-------.svg | 28 +- milstd2525/icons/war/sugauumrg------.svg | 28 +- milstd2525/icons/war/sugauumrs------.svg | 28 +- milstd2525/icons/war/sugauumrss-----.svg | 28 +- milstd2525/icons/war/sugauumrx------.svg | 28 +- milstd2525/icons/war/sugauums-------.svg | 28 +- milstd2525/icons/war/sugauumse------.svg | 28 +- milstd2525/icons/war/sugauumsea-----.svg | 28 +- milstd2525/icons/war/sugauumsec-----.svg | 28 +- milstd2525/icons/war/sugauumsed-----.svg | 28 +- milstd2525/icons/war/sugauumsei-----.svg | 28 +- milstd2525/icons/war/sugauumsej-----.svg | 28 +- milstd2525/icons/war/sugauumset-----.svg | 28 +- milstd2525/icons/war/sugauumt-------.svg | 28 +- milstd2525/icons/war/sugauup--------.svg | 28 +- milstd2525/icons/war/sugauus--------.svg | 28 +- milstd2525/icons/war/sugauusa-------.svg | 28 +- milstd2525/icons/war/sugauusc-------.svg | 28 +- milstd2525/icons/war/sugauuscl------.svg | 28 +- milstd2525/icons/war/sugauusf-------.svg | 28 +- milstd2525/icons/war/sugauusm-------.svg | 28 +- milstd2525/icons/war/sugauusml------.svg | 28 +- milstd2525/icons/war/sugauusmn------.svg | 28 +- milstd2525/icons/war/sugauusms------.svg | 28 +- milstd2525/icons/war/sugauuso-------.svg | 28 +- milstd2525/icons/war/sugauusr-------.svg | 28 +- milstd2525/icons/war/sugauusrs------.svg | 28 +- milstd2525/icons/war/sugauusrt------.svg | 28 +- milstd2525/icons/war/sugauusrw------.svg | 28 +- milstd2525/icons/war/sugauuss-------.svg | 28 +- milstd2525/icons/war/sugauusw-------.svg | 28 +- milstd2525/icons/war/sugauusx-------.svg | 28 +- milstd2525/icons/war/sugp-----------.svg | 28 +- milstd2525/icons/war/sugpe----------.svg | 28 +- milstd2525/icons/war/sugpes---------.svg | 28 +- milstd2525/icons/war/sugpese--------.svg | 28 +- milstd2525/icons/war/sugpesr--------.svg | 28 +- milstd2525/icons/war/sugpev---------.svg | 28 +- milstd2525/icons/war/sugpeva--------.svg | 28 +- milstd2525/icons/war/sugpevaa-------.svg | 28 +- milstd2525/icons/war/sugpevaar------.svg | 28 +- milstd2525/icons/war/sugpevac-------.svg | 28 +- milstd2525/icons/war/sugpevai-------.svg | 28 +- milstd2525/icons/war/sugpeval-------.svg | 28 +- milstd2525/icons/war/sugpevas-------.svg | 28 +- milstd2525/icons/war/sugpevat-------.svg | 28 +- milstd2525/icons/war/sugpevath------.svg | 28 +- milstd2525/icons/war/sugpevathr-----.svg | 28 +- milstd2525/icons/war/sugpevatl------.svg | 28 +- milstd2525/icons/war/sugpevatlr-----.svg | 28 +- milstd2525/icons/war/sugpevatm------.svg | 28 +- milstd2525/icons/war/sugpevatmr-----.svg | 28 +- milstd2525/icons/war/sugpevc--------.svg | 28 +- milstd2525/icons/war/sugpevca-------.svg | 28 +- milstd2525/icons/war/sugpevcah------.svg | 28 +- milstd2525/icons/war/sugpevcal------.svg | 28 +- milstd2525/icons/war/sugpevcam------.svg | 28 +- milstd2525/icons/war/sugpevcf-------.svg | 28 +- milstd2525/icons/war/sugpevcfh------.svg | 28 +- milstd2525/icons/war/sugpevcfl------.svg | 28 +- milstd2525/icons/war/sugpevcfm------.svg | 28 +- milstd2525/icons/war/sugpevcj-------.svg | 28 +- milstd2525/icons/war/sugpevcjh------.svg | 28 +- milstd2525/icons/war/sugpevcjl------.svg | 28 +- milstd2525/icons/war/sugpevcjm------.svg | 28 +- milstd2525/icons/war/sugpevcm-------.svg | 28 +- milstd2525/icons/war/sugpevcmh------.svg | 28 +- milstd2525/icons/war/sugpevcml------.svg | 28 +- milstd2525/icons/war/sugpevcmm------.svg | 28 +- milstd2525/icons/war/sugpevco-------.svg | 28 +- milstd2525/icons/war/sugpevcoh------.svg | 28 +- milstd2525/icons/war/sugpevcol------.svg | 28 +- milstd2525/icons/war/sugpevcom------.svg | 28 +- milstd2525/icons/war/sugpevct-------.svg | 28 +- milstd2525/icons/war/sugpevcth------.svg | 28 +- milstd2525/icons/war/sugpevctl------.svg | 28 +- milstd2525/icons/war/sugpevctm------.svg | 28 +- milstd2525/icons/war/sugpevcu-------.svg | 28 +- milstd2525/icons/war/sugpevcuh------.svg | 28 +- milstd2525/icons/war/sugpevcul------.svg | 28 +- milstd2525/icons/war/sugpevcum------.svg | 28 +- milstd2525/icons/war/sugpeve--------.svg | 28 +- milstd2525/icons/war/sugpevea-------.svg | 28 +- milstd2525/icons/war/sugpeveaa------.svg | 28 +- milstd2525/icons/war/sugpeveat------.svg | 28 +- milstd2525/icons/war/sugpeveb-------.svg | 28 +- milstd2525/icons/war/sugpevec-------.svg | 28 +- milstd2525/icons/war/sugpeved-------.svg | 28 +- milstd2525/icons/war/sugpeveda------.svg | 28 +- milstd2525/icons/war/sugpevee-------.svg | 28 +- milstd2525/icons/war/sugpevef-------.svg | 28 +- milstd2525/icons/war/sugpeveh-------.svg | 28 +- milstd2525/icons/war/sugpevem-------.svg | 28 +- milstd2525/icons/war/sugpeveml------.svg | 28 +- milstd2525/icons/war/sugpevemv------.svg | 28 +- milstd2525/icons/war/sugpever-------.svg | 28 +- milstd2525/icons/war/sugpeves-------.svg | 28 +- milstd2525/icons/war/sugpevm--------.svg | 28 +- milstd2525/icons/war/sugpevs--------.svg | 28 +- milstd2525/icons/war/sugpevsc-------.svg | 28 +- milstd2525/icons/war/sugpevsp-------.svg | 28 +- milstd2525/icons/war/sugpevsr-------.svg | 28 +- milstd2525/icons/war/sugpevst-------.svg | 28 +- milstd2525/icons/war/sugpevsw-------.svg | 28 +- milstd2525/icons/war/sugpevt--------.svg | 28 +- milstd2525/icons/war/sugpevu--------.svg | 28 +- milstd2525/icons/war/sugpevua-------.svg | 28 +- milstd2525/icons/war/sugpevuaa------.svg | 28 +- milstd2525/icons/war/sugpevub-------.svg | 28 +- milstd2525/icons/war/sugpevul-------.svg | 28 +- milstd2525/icons/war/sugpevur-------.svg | 28 +- milstd2525/icons/war/sugpevus-------.svg | 28 +- milstd2525/icons/war/sugpevush------.svg | 28 +- milstd2525/icons/war/sugpevusl------.svg | 28 +- milstd2525/icons/war/sugpevusm------.svg | 28 +- milstd2525/icons/war/sugpevut-------.svg | 28 +- milstd2525/icons/war/sugpevuth------.svg | 28 +- milstd2525/icons/war/sugpevutl------.svg | 28 +- milstd2525/icons/war/sugpevux-------.svg | 28 +- milstd2525/icons/war/sugpewa--------.svg | 28 +- milstd2525/icons/war/sugpewah-------.svg | 28 +- milstd2525/icons/war/sugpewal-------.svg | 28 +- milstd2525/icons/war/sugpewam-------.svg | 28 +- milstd2525/icons/war/sugpewd--------.svg | 28 +- milstd2525/icons/war/sugpewdh-------.svg | 28 +- milstd2525/icons/war/sugpewdhs------.svg | 28 +- milstd2525/icons/war/sugpewdl-------.svg | 28 +- milstd2525/icons/war/sugpewdls------.svg | 28 +- milstd2525/icons/war/sugpewdm-------.svg | 28 +- milstd2525/icons/war/sugpewdms------.svg | 28 +- milstd2525/icons/war/sugpewg--------.svg | 28 +- milstd2525/icons/war/sugpewgh-------.svg | 28 +- milstd2525/icons/war/sugpewgl-------.svg | 28 +- milstd2525/icons/war/sugpewgm-------.svg | 28 +- milstd2525/icons/war/sugpewgr-------.svg | 28 +- milstd2525/icons/war/sugpewh--------.svg | 28 +- milstd2525/icons/war/sugpewhh-------.svg | 28 +- milstd2525/icons/war/sugpewhhs------.svg | 28 +- milstd2525/icons/war/sugpewhl-------.svg | 28 +- milstd2525/icons/war/sugpewhls------.svg | 28 +- milstd2525/icons/war/sugpewhm-------.svg | 28 +- milstd2525/icons/war/sugpewhms------.svg | 28 +- milstd2525/icons/war/sugpewm--------.svg | 28 +- milstd2525/icons/war/sugpewma-------.svg | 28 +- milstd2525/icons/war/sugpewmai------.svg | 28 +- milstd2525/icons/war/sugpewmaie-----.svg | 28 +- milstd2525/icons/war/sugpewmair-----.svg | 28 +- milstd2525/icons/war/sugpewmal------.svg | 28 +- milstd2525/icons/war/sugpewmale-----.svg | 28 +- milstd2525/icons/war/sugpewmalr-----.svg | 28 +- milstd2525/icons/war/sugpewmas------.svg | 28 +- milstd2525/icons/war/sugpewmase-----.svg | 28 +- milstd2525/icons/war/sugpewmasr-----.svg | 28 +- milstd2525/icons/war/sugpewmat------.svg | 28 +- milstd2525/icons/war/sugpewmate-----.svg | 28 +- milstd2525/icons/war/sugpewmatr-----.svg | 28 +- milstd2525/icons/war/sugpewms-------.svg | 28 +- milstd2525/icons/war/sugpewmsi------.svg | 28 +- milstd2525/icons/war/sugpewmsl------.svg | 28 +- milstd2525/icons/war/sugpewmss------.svg | 28 +- milstd2525/icons/war/sugpewmt-------.svg | 28 +- milstd2525/icons/war/sugpewmth------.svg | 28 +- milstd2525/icons/war/sugpewmtl------.svg | 28 +- milstd2525/icons/war/sugpewmtm------.svg | 28 +- milstd2525/icons/war/sugpewo--------.svg | 28 +- milstd2525/icons/war/sugpewoh-------.svg | 28 +- milstd2525/icons/war/sugpewol-------.svg | 28 +- milstd2525/icons/war/sugpewom-------.svg | 28 +- milstd2525/icons/war/sugpewr--------.svg | 28 +- milstd2525/icons/war/sugpewrh-------.svg | 28 +- milstd2525/icons/war/sugpewrl-------.svg | 28 +- milstd2525/icons/war/sugpewrr-------.svg | 28 +- milstd2525/icons/war/sugpews--------.svg | 28 +- milstd2525/icons/war/sugpewsh-------.svg | 28 +- milstd2525/icons/war/sugpewsl-------.svg | 28 +- milstd2525/icons/war/sugpewsm-------.svg | 28 +- milstd2525/icons/war/sugpewt--------.svg | 28 +- milstd2525/icons/war/sugpewth-------.svg | 28 +- milstd2525/icons/war/sugpewtl-------.svg | 28 +- milstd2525/icons/war/sugpewtm-------.svg | 28 +- milstd2525/icons/war/sugpewx--------.svg | 28 +- milstd2525/icons/war/sugpewxh-------.svg | 28 +- milstd2525/icons/war/sugpewxl-------.svg | 28 +- milstd2525/icons/war/sugpewxm-------.svg | 28 +- milstd2525/icons/war/sugpewz--------.svg | 28 +- milstd2525/icons/war/sugpewzh-------.svg | 28 +- milstd2525/icons/war/sugpewzl-------.svg | 28 +- milstd2525/icons/war/sugpewzm-------.svg | 28 +- milstd2525/icons/war/sugpexf--------.svg | 28 +- milstd2525/icons/war/sugpexi--------.svg | 28 +- milstd2525/icons/war/sugpexl--------.svg | 28 +- milstd2525/icons/war/sugpexm--------.svg | 28 +- milstd2525/icons/war/sugpexmc-------.svg | 28 +- milstd2525/icons/war/sugpexml-------.svg | 28 +- milstd2525/icons/war/sugpexn--------.svg | 28 +- milstd2525/icons/war/sugpi----------.svg | 28 +- milstd2525/icons/war/sugpib---------.svg | 28 +- milstd2525/icons/war/sugpiba--------.svg | 28 +- milstd2525/icons/war/sugpibn--------.svg | 28 +- milstd2525/icons/war/sugpie---------.svg | 28 +- milstd2525/icons/war/sugpig---------.svg | 28 +- milstd2525/icons/war/sugpima--------.svg | 28 +- milstd2525/icons/war/sugpimc--------.svg | 28 +- milstd2525/icons/war/sugpime--------.svg | 28 +- milstd2525/icons/war/sugpimf--------.svg | 28 +- milstd2525/icons/war/sugpimfa-------.svg | 28 +- milstd2525/icons/war/sugpimfp-------.svg | 28 +- milstd2525/icons/war/sugpimfpw------.svg | 28 +- milstd2525/icons/war/sugpimfs-------.svg | 28 +- milstd2525/icons/war/sugpimg--------.svg | 28 +- milstd2525/icons/war/sugpimm--------.svg | 28 +- milstd2525/icons/war/sugpimn--------.svg | 28 +- milstd2525/icons/war/sugpimnb-------.svg | 28 +- milstd2525/icons/war/sugpims--------.svg | 28 +- milstd2525/icons/war/sugpimv--------.svg | 28 +- milstd2525/icons/war/sugpip---------.svg | 28 +- milstd2525/icons/war/sugpipd--------.svg | 28 +- milstd2525/icons/war/sugpir---------.svg | 28 +- milstd2525/icons/war/sugpirm--------.svg | 28 +- milstd2525/icons/war/sugpirn--------.svg | 28 +- milstd2525/icons/war/sugpirnb-------.svg | 28 +- milstd2525/icons/war/sugpirnc-------.svg | 28 +- milstd2525/icons/war/sugpirnn-------.svg | 28 +- milstd2525/icons/war/sugpirp--------.svg | 28 +- milstd2525/icons/war/sugpit---------.svg | 28 +- milstd2525/icons/war/sugpiu---------.svg | 28 +- milstd2525/icons/war/sugpiue--------.svg | 28 +- milstd2525/icons/war/sugpiued-------.svg | 28 +- milstd2525/icons/war/sugpiuef-------.svg | 28 +- milstd2525/icons/war/sugpiuen-------.svg | 28 +- milstd2525/icons/war/sugpiup--------.svg | 28 +- milstd2525/icons/war/sugpiur--------.svg | 28 +- milstd2525/icons/war/sugpiut--------.svg | 28 +- milstd2525/icons/war/sugpix---------.svg | 28 +- milstd2525/icons/war/sugpixh--------.svg | 28 +- milstd2525/icons/war/sugpu----------.svg | 28 +- milstd2525/icons/war/sugpuc---------.svg | 28 +- milstd2525/icons/war/sugpuca--------.svg | 28 +- milstd2525/icons/war/sugpucaa-------.svg | 28 +- milstd2525/icons/war/sugpucaaa------.svg | 28 +- milstd2525/icons/war/sugpucaaas-----.svg | 28 +- milstd2525/icons/war/sugpucaaat-----.svg | 28 +- milstd2525/icons/war/sugpucaaaw-----.svg | 28 +- milstd2525/icons/war/sugpucaac------.svg | 28 +- milstd2525/icons/war/sugpucaad------.svg | 28 +- milstd2525/icons/war/sugpucaal------.svg | 28 +- milstd2525/icons/war/sugpucaam------.svg | 28 +- milstd2525/icons/war/sugpucaao------.svg | 28 +- milstd2525/icons/war/sugpucaaos-----.svg | 28 +- milstd2525/icons/war/sugpucaas------.svg | 28 +- milstd2525/icons/war/sugpucaau------.svg | 28 +- milstd2525/icons/war/sugpucat-------.svg | 28 +- milstd2525/icons/war/sugpucata------.svg | 28 +- milstd2525/icons/war/sugpucath------.svg | 28 +- milstd2525/icons/war/sugpucatl------.svg | 28 +- milstd2525/icons/war/sugpucatm------.svg | 28 +- milstd2525/icons/war/sugpucatr------.svg | 28 +- milstd2525/icons/war/sugpucatw------.svg | 28 +- milstd2525/icons/war/sugpucatwr-----.svg | 28 +- milstd2525/icons/war/sugpucaw-------.svg | 28 +- milstd2525/icons/war/sugpucawa------.svg | 28 +- milstd2525/icons/war/sugpucawh------.svg | 28 +- milstd2525/icons/war/sugpucawl------.svg | 28 +- milstd2525/icons/war/sugpucawm------.svg | 28 +- milstd2525/icons/war/sugpucawr------.svg | 28 +- milstd2525/icons/war/sugpucaws------.svg | 28 +- milstd2525/icons/war/sugpucaww------.svg | 28 +- milstd2525/icons/war/sugpucawwr-----.svg | 28 +- milstd2525/icons/war/sugpucd--------.svg | 28 +- milstd2525/icons/war/sugpucdc-------.svg | 28 +- milstd2525/icons/war/sugpucdg-------.svg | 28 +- milstd2525/icons/war/sugpucdh-------.svg | 28 +- milstd2525/icons/war/sugpucdhh------.svg | 28 +- milstd2525/icons/war/sugpucdhp------.svg | 28 +- milstd2525/icons/war/sugpucdm-------.svg | 28 +- milstd2525/icons/war/sugpucdmh------.svg | 28 +- milstd2525/icons/war/sugpucdml------.svg | 28 +- milstd2525/icons/war/sugpucdmla-----.svg | 28 +- milstd2525/icons/war/sugpucdmm------.svg | 28 +- milstd2525/icons/war/sugpucdo-------.svg | 28 +- milstd2525/icons/war/sugpucds-------.svg | 28 +- milstd2525/icons/war/sugpucdsc------.svg | 28 +- milstd2525/icons/war/sugpucdss------.svg | 28 +- milstd2525/icons/war/sugpucdsv------.svg | 28 +- milstd2525/icons/war/sugpucdt-------.svg | 28 +- milstd2525/icons/war/sugpuce--------.svg | 28 +- milstd2525/icons/war/sugpucec-------.svg | 28 +- milstd2525/icons/war/sugpuceca------.svg | 28 +- milstd2525/icons/war/sugpucecc------.svg | 28 +- milstd2525/icons/war/sugpucech------.svg | 28 +- milstd2525/icons/war/sugpucecl------.svg | 28 +- milstd2525/icons/war/sugpucecm------.svg | 28 +- milstd2525/icons/war/sugpuceco------.svg | 28 +- milstd2525/icons/war/sugpucecr------.svg | 28 +- milstd2525/icons/war/sugpucecs------.svg | 28 +- milstd2525/icons/war/sugpucect------.svg | 28 +- milstd2525/icons/war/sugpucecw------.svg | 28 +- milstd2525/icons/war/sugpucen-------.svg | 28 +- milstd2525/icons/war/sugpucenn------.svg | 28 +- milstd2525/icons/war/sugpucf--------.svg | 28 +- milstd2525/icons/war/sugpucfh-------.svg | 28 +- milstd2525/icons/war/sugpucfha------.svg | 28 +- milstd2525/icons/war/sugpucfhc------.svg | 28 +- milstd2525/icons/war/sugpucfhe------.svg | 28 +- milstd2525/icons/war/sugpucfhh------.svg | 28 +- milstd2525/icons/war/sugpucfhl------.svg | 28 +- milstd2525/icons/war/sugpucfhm------.svg | 28 +- milstd2525/icons/war/sugpucfho------.svg | 28 +- milstd2525/icons/war/sugpucfhs------.svg | 28 +- milstd2525/icons/war/sugpucfhx------.svg | 28 +- milstd2525/icons/war/sugpucfm-------.svg | 28 +- milstd2525/icons/war/sugpucfml------.svg | 28 +- milstd2525/icons/war/sugpucfms------.svg | 28 +- milstd2525/icons/war/sugpucfmt------.svg | 28 +- milstd2525/icons/war/sugpucfmta-----.svg | 28 +- milstd2525/icons/war/sugpucfmtc-----.svg | 28 +- milstd2525/icons/war/sugpucfmto-----.svg | 28 +- milstd2525/icons/war/sugpucfmts-----.svg | 28 +- milstd2525/icons/war/sugpucfmw------.svg | 28 +- milstd2525/icons/war/sugpucfo-------.svg | 28 +- milstd2525/icons/war/sugpucfoa------.svg | 28 +- milstd2525/icons/war/sugpucfol------.svg | 28 +- milstd2525/icons/war/sugpucfoo------.svg | 28 +- milstd2525/icons/war/sugpucfos------.svg | 28 +- milstd2525/icons/war/sugpucfr-------.svg | 28 +- milstd2525/icons/war/sugpucfrm------.svg | 28 +- milstd2525/icons/war/sugpucfrmr-----.svg | 28 +- milstd2525/icons/war/sugpucfrms-----.svg | 28 +- milstd2525/icons/war/sugpucfrmt-----.svg | 28 +- milstd2525/icons/war/sugpucfrs------.svg | 28 +- milstd2525/icons/war/sugpucfrsr-----.svg | 28 +- milstd2525/icons/war/sugpucfrss-----.svg | 28 +- milstd2525/icons/war/sugpucfrst-----.svg | 28 +- milstd2525/icons/war/sugpucfs-------.svg | 28 +- milstd2525/icons/war/sugpucfsa------.svg | 28 +- milstd2525/icons/war/sugpucfsl------.svg | 28 +- milstd2525/icons/war/sugpucfso------.svg | 28 +- milstd2525/icons/war/sugpucfss------.svg | 28 +- milstd2525/icons/war/sugpucft-------.svg | 28 +- milstd2525/icons/war/sugpucfta------.svg | 28 +- milstd2525/icons/war/sugpucftc------.svg | 28 +- milstd2525/icons/war/sugpucftcd-----.svg | 28 +- milstd2525/icons/war/sugpucftcm-----.svg | 28 +- milstd2525/icons/war/sugpucftf------.svg | 28 +- milstd2525/icons/war/sugpucftr------.svg | 28 +- milstd2525/icons/war/sugpucfts------.svg | 28 +- milstd2525/icons/war/sugpuci--------.svg | 28 +- milstd2525/icons/war/sugpucia-------.svg | 28 +- milstd2525/icons/war/sugpucic-------.svg | 28 +- milstd2525/icons/war/sugpucii-------.svg | 28 +- milstd2525/icons/war/sugpucil-------.svg | 28 +- milstd2525/icons/war/sugpucim-------.svg | 28 +- milstd2525/icons/war/sugpucin-------.svg | 28 +- milstd2525/icons/war/sugpucio-------.svg | 28 +- milstd2525/icons/war/sugpucis-------.svg | 28 +- milstd2525/icons/war/sugpuciz-------.svg | 28 +- milstd2525/icons/war/sugpucm--------.svg | 28 +- milstd2525/icons/war/sugpucms-------.svg | 28 +- milstd2525/icons/war/sugpucmt-------.svg | 28 +- milstd2525/icons/war/sugpucr--------.svg | 28 +- milstd2525/icons/war/sugpucra-------.svg | 28 +- milstd2525/icons/war/sugpucrc-------.svg | 28 +- milstd2525/icons/war/sugpucrh-------.svg | 28 +- milstd2525/icons/war/sugpucrl-------.svg | 28 +- milstd2525/icons/war/sugpucro-------.svg | 28 +- milstd2525/icons/war/sugpucrr-------.svg | 28 +- milstd2525/icons/war/sugpucrrd------.svg | 28 +- milstd2525/icons/war/sugpucrrf------.svg | 28 +- milstd2525/icons/war/sugpucrrl------.svg | 28 +- milstd2525/icons/war/sugpucrs-------.svg | 28 +- milstd2525/icons/war/sugpucrv-------.svg | 28 +- milstd2525/icons/war/sugpucrva------.svg | 28 +- milstd2525/icons/war/sugpucrvg------.svg | 28 +- milstd2525/icons/war/sugpucrvm------.svg | 28 +- milstd2525/icons/war/sugpucrvo------.svg | 28 +- milstd2525/icons/war/sugpucrx-------.svg | 28 +- milstd2525/icons/war/sugpucs--------.svg | 28 +- milstd2525/icons/war/sugpucsa-------.svg | 28 +- milstd2525/icons/war/sugpucsg-------.svg | 28 +- milstd2525/icons/war/sugpucsga------.svg | 28 +- milstd2525/icons/war/sugpucsgd------.svg | 28 +- milstd2525/icons/war/sugpucsgm------.svg | 28 +- milstd2525/icons/war/sugpucsm-------.svg | 28 +- milstd2525/icons/war/sugpucsr-------.svg | 28 +- milstd2525/icons/war/sugpucsw-------.svg | 28 +- milstd2525/icons/war/sugpucv--------.svg | 28 +- milstd2525/icons/war/sugpucvc-------.svg | 28 +- milstd2525/icons/war/sugpucvf-------.svg | 28 +- milstd2525/icons/war/sugpucvfa------.svg | 28 +- milstd2525/icons/war/sugpucvfr------.svg | 28 +- milstd2525/icons/war/sugpucvfu------.svg | 28 +- milstd2525/icons/war/sugpucvr-------.svg | 28 +- milstd2525/icons/war/sugpucvra------.svg | 28 +- milstd2525/icons/war/sugpucvrm------.svg | 28 +- milstd2525/icons/war/sugpucvrs------.svg | 28 +- milstd2525/icons/war/sugpucvru------.svg | 28 +- milstd2525/icons/war/sugpucvruc-----.svg | 28 +- milstd2525/icons/war/sugpucvrue-----.svg | 28 +- milstd2525/icons/war/sugpucvruh-----.svg | 28 +- milstd2525/icons/war/sugpucvrul-----.svg | 28 +- milstd2525/icons/war/sugpucvrum-----.svg | 28 +- milstd2525/icons/war/sugpucvrw------.svg | 28 +- milstd2525/icons/war/sugpucvs-------.svg | 28 +- milstd2525/icons/war/sugpucvu-------.svg | 28 +- milstd2525/icons/war/sugpucvuf------.svg | 28 +- milstd2525/icons/war/sugpucvur------.svg | 28 +- milstd2525/icons/war/sugpucvv-------.svg | 28 +- milstd2525/icons/war/sugpuh---------.svg | 28 +- milstd2525/icons/war/sugpus---------.svg | 28 +- milstd2525/icons/war/sugpusa--------.svg | 28 +- milstd2525/icons/war/sugpusac-------.svg | 28 +- milstd2525/icons/war/sugpusaf-------.svg | 28 +- milstd2525/icons/war/sugpusafc------.svg | 28 +- milstd2525/icons/war/sugpusaft------.svg | 28 +- milstd2525/icons/war/sugpusaj-------.svg | 28 +- milstd2525/icons/war/sugpusajc------.svg | 28 +- milstd2525/icons/war/sugpusajt------.svg | 28 +- milstd2525/icons/war/sugpusal-------.svg | 28 +- milstd2525/icons/war/sugpusalc------.svg | 28 +- milstd2525/icons/war/sugpusalt------.svg | 28 +- milstd2525/icons/war/sugpusam-------.svg | 28 +- milstd2525/icons/war/sugpusamc------.svg | 28 +- milstd2525/icons/war/sugpusamt------.svg | 28 +- milstd2525/icons/war/sugpusao-------.svg | 28 +- milstd2525/icons/war/sugpusaoc------.svg | 28 +- milstd2525/icons/war/sugpusaot------.svg | 28 +- milstd2525/icons/war/sugpusap-------.svg | 28 +- milstd2525/icons/war/sugpusapb------.svg | 28 +- milstd2525/icons/war/sugpusapbc-----.svg | 28 +- milstd2525/icons/war/sugpusapbt-----.svg | 28 +- milstd2525/icons/war/sugpusapc------.svg | 28 +- milstd2525/icons/war/sugpusapm------.svg | 28 +- milstd2525/icons/war/sugpusapmc-----.svg | 28 +- milstd2525/icons/war/sugpusapmt-----.svg | 28 +- milstd2525/icons/war/sugpusapt------.svg | 28 +- milstd2525/icons/war/sugpusaq-------.svg | 28 +- milstd2525/icons/war/sugpusaqc------.svg | 28 +- milstd2525/icons/war/sugpusaqt------.svg | 28 +- milstd2525/icons/war/sugpusar-------.svg | 28 +- milstd2525/icons/war/sugpusarc------.svg | 28 +- milstd2525/icons/war/sugpusart------.svg | 28 +- milstd2525/icons/war/sugpusas-------.svg | 28 +- milstd2525/icons/war/sugpusasc------.svg | 28 +- milstd2525/icons/war/sugpusast------.svg | 28 +- milstd2525/icons/war/sugpusat-------.svg | 28 +- milstd2525/icons/war/sugpusaw-------.svg | 28 +- milstd2525/icons/war/sugpusawc------.svg | 28 +- milstd2525/icons/war/sugpusawt------.svg | 28 +- milstd2525/icons/war/sugpusax-------.svg | 28 +- milstd2525/icons/war/sugpusaxc------.svg | 28 +- milstd2525/icons/war/sugpusaxt------.svg | 28 +- milstd2525/icons/war/sugpusm--------.svg | 28 +- milstd2525/icons/war/sugpusmc-------.svg | 28 +- milstd2525/icons/war/sugpusmd-------.svg | 28 +- milstd2525/icons/war/sugpusmdc------.svg | 28 +- milstd2525/icons/war/sugpusmdt------.svg | 28 +- milstd2525/icons/war/sugpusmm-------.svg | 28 +- milstd2525/icons/war/sugpusmmc------.svg | 28 +- milstd2525/icons/war/sugpusmmt------.svg | 28 +- milstd2525/icons/war/sugpusmp-------.svg | 28 +- milstd2525/icons/war/sugpusmpc------.svg | 28 +- milstd2525/icons/war/sugpusmpt------.svg | 28 +- milstd2525/icons/war/sugpusmt-------.svg | 28 +- milstd2525/icons/war/sugpusmv-------.svg | 28 +- milstd2525/icons/war/sugpusmvc------.svg | 28 +- milstd2525/icons/war/sugpusmvt------.svg | 28 +- milstd2525/icons/war/sugpuss--------.svg | 28 +- milstd2525/icons/war/sugpuss1-------.svg | 28 +- milstd2525/icons/war/sugpuss1c------.svg | 28 +- milstd2525/icons/war/sugpuss1t------.svg | 28 +- milstd2525/icons/war/sugpuss2-------.svg | 28 +- milstd2525/icons/war/sugpuss2c------.svg | 28 +- milstd2525/icons/war/sugpuss2t------.svg | 28 +- milstd2525/icons/war/sugpuss3-------.svg | 28 +- milstd2525/icons/war/sugpuss3a------.svg | 28 +- milstd2525/icons/war/sugpuss3ac-----.svg | 28 +- milstd2525/icons/war/sugpuss3at-----.svg | 28 +- milstd2525/icons/war/sugpuss3c------.svg | 28 +- milstd2525/icons/war/sugpuss3t------.svg | 28 +- milstd2525/icons/war/sugpuss4-------.svg | 28 +- milstd2525/icons/war/sugpuss4c------.svg | 28 +- milstd2525/icons/war/sugpuss4t------.svg | 28 +- milstd2525/icons/war/sugpuss5-------.svg | 28 +- milstd2525/icons/war/sugpuss5c------.svg | 28 +- milstd2525/icons/war/sugpuss5t------.svg | 28 +- milstd2525/icons/war/sugpuss6-------.svg | 28 +- milstd2525/icons/war/sugpuss6c------.svg | 28 +- milstd2525/icons/war/sugpuss6t------.svg | 28 +- milstd2525/icons/war/sugpuss7-------.svg | 28 +- milstd2525/icons/war/sugpuss7c------.svg | 28 +- milstd2525/icons/war/sugpuss7t------.svg | 28 +- milstd2525/icons/war/sugpuss8-------.svg | 28 +- milstd2525/icons/war/sugpuss8c------.svg | 28 +- milstd2525/icons/war/sugpuss8t------.svg | 28 +- milstd2525/icons/war/sugpuss9-------.svg | 28 +- milstd2525/icons/war/sugpuss9c------.svg | 28 +- milstd2525/icons/war/sugpuss9t------.svg | 28 +- milstd2525/icons/war/sugpussc-------.svg | 28 +- milstd2525/icons/war/sugpussl-------.svg | 28 +- milstd2525/icons/war/sugpusslc------.svg | 28 +- milstd2525/icons/war/sugpusslt------.svg | 28 +- milstd2525/icons/war/sugpusst-------.svg | 28 +- milstd2525/icons/war/sugpussw-------.svg | 28 +- milstd2525/icons/war/sugpusswc------.svg | 28 +- milstd2525/icons/war/sugpusswp------.svg | 28 +- milstd2525/icons/war/sugpusswpc-----.svg | 28 +- milstd2525/icons/war/sugpusswpt-----.svg | 28 +- milstd2525/icons/war/sugpusswt------.svg | 28 +- milstd2525/icons/war/sugpussx-------.svg | 28 +- milstd2525/icons/war/sugpussxc------.svg | 28 +- milstd2525/icons/war/sugpussxt------.svg | 28 +- milstd2525/icons/war/sugpust--------.svg | 28 +- milstd2525/icons/war/sugpusta-------.svg | 28 +- milstd2525/icons/war/sugpustac------.svg | 28 +- milstd2525/icons/war/sugpustat------.svg | 28 +- milstd2525/icons/war/sugpustc-------.svg | 28 +- milstd2525/icons/war/sugpusti-------.svg | 28 +- milstd2525/icons/war/sugpustic------.svg | 28 +- milstd2525/icons/war/sugpustit------.svg | 28 +- milstd2525/icons/war/sugpustm-------.svg | 28 +- milstd2525/icons/war/sugpustmc------.svg | 28 +- milstd2525/icons/war/sugpustmt------.svg | 28 +- milstd2525/icons/war/sugpustr-------.svg | 28 +- milstd2525/icons/war/sugpustrc------.svg | 28 +- milstd2525/icons/war/sugpustrt------.svg | 28 +- milstd2525/icons/war/sugpusts-------.svg | 28 +- milstd2525/icons/war/sugpustsc------.svg | 28 +- milstd2525/icons/war/sugpustst------.svg | 28 +- milstd2525/icons/war/sugpustt-------.svg | 28 +- milstd2525/icons/war/sugpusx--------.svg | 28 +- milstd2525/icons/war/sugpusxc-------.svg | 28 +- milstd2525/icons/war/sugpusxe-------.svg | 28 +- milstd2525/icons/war/sugpusxec------.svg | 28 +- milstd2525/icons/war/sugpusxet------.svg | 28 +- milstd2525/icons/war/sugpusxh-------.svg | 28 +- milstd2525/icons/war/sugpusxhc------.svg | 28 +- milstd2525/icons/war/sugpusxht------.svg | 28 +- milstd2525/icons/war/sugpusxo-------.svg | 28 +- milstd2525/icons/war/sugpusxoc------.svg | 28 +- milstd2525/icons/war/sugpusxom------.svg | 28 +- milstd2525/icons/war/sugpusxomc-----.svg | 28 +- milstd2525/icons/war/sugpusxomt-----.svg | 28 +- milstd2525/icons/war/sugpusxot------.svg | 28 +- milstd2525/icons/war/sugpusxr-------.svg | 28 +- milstd2525/icons/war/sugpusxrc------.svg | 28 +- milstd2525/icons/war/sugpusxrt------.svg | 28 +- milstd2525/icons/war/sugpusxt-------.svg | 28 +- milstd2525/icons/war/sugpuu---------.svg | 28 +- milstd2525/icons/war/sugpuua--------.svg | 28 +- milstd2525/icons/war/sugpuuab-------.svg | 28 +- milstd2525/icons/war/sugpuuabr------.svg | 28 +- milstd2525/icons/war/sugpuuac-------.svg | 28 +- milstd2525/icons/war/sugpuuacc------.svg | 28 +- milstd2525/icons/war/sugpuuacck-----.svg | 28 +- milstd2525/icons/war/sugpuuaccm-----.svg | 28 +- milstd2525/icons/war/sugpuuacr------.svg | 28 +- milstd2525/icons/war/sugpuuacrs-----.svg | 28 +- milstd2525/icons/war/sugpuuacrw-----.svg | 28 +- milstd2525/icons/war/sugpuuacs------.svg | 28 +- milstd2525/icons/war/sugpuuacsa-----.svg | 28 +- milstd2525/icons/war/sugpuuacsm-----.svg | 28 +- milstd2525/icons/war/sugpuuad-------.svg | 28 +- milstd2525/icons/war/sugpuuan-------.svg | 28 +- milstd2525/icons/war/sugpuue--------.svg | 28 +- milstd2525/icons/war/sugpuui--------.svg | 28 +- milstd2525/icons/war/sugpuul--------.svg | 28 +- milstd2525/icons/war/sugpuulc-------.svg | 28 +- milstd2525/icons/war/sugpuuld-------.svg | 28 +- milstd2525/icons/war/sugpuulf-------.svg | 28 +- milstd2525/icons/war/sugpuulm-------.svg | 28 +- milstd2525/icons/war/sugpuuls-------.svg | 28 +- milstd2525/icons/war/sugpuum--------.svg | 28 +- milstd2525/icons/war/sugpuuma-------.svg | 28 +- milstd2525/icons/war/sugpuumc-------.svg | 28 +- milstd2525/icons/war/sugpuumj-------.svg | 28 +- milstd2525/icons/war/sugpuummo------.svg | 28 +- milstd2525/icons/war/sugpuumo-------.svg | 28 +- milstd2525/icons/war/sugpuumq-------.svg | 28 +- milstd2525/icons/war/sugpuumr-------.svg | 28 +- milstd2525/icons/war/sugpuumrg------.svg | 28 +- milstd2525/icons/war/sugpuumrs------.svg | 28 +- milstd2525/icons/war/sugpuumrss-----.svg | 28 +- milstd2525/icons/war/sugpuumrx------.svg | 28 +- milstd2525/icons/war/sugpuums-------.svg | 28 +- milstd2525/icons/war/sugpuumse------.svg | 28 +- milstd2525/icons/war/sugpuumsea-----.svg | 28 +- milstd2525/icons/war/sugpuumsec-----.svg | 28 +- milstd2525/icons/war/sugpuumsed-----.svg | 28 +- milstd2525/icons/war/sugpuumsei-----.svg | 28 +- milstd2525/icons/war/sugpuumsej-----.svg | 28 +- milstd2525/icons/war/sugpuumset-----.svg | 28 +- milstd2525/icons/war/sugpuumt-------.svg | 28 +- milstd2525/icons/war/sugpuup--------.svg | 28 +- milstd2525/icons/war/sugpuus--------.svg | 28 +- milstd2525/icons/war/sugpuusa-------.svg | 28 +- milstd2525/icons/war/sugpuusc-------.svg | 28 +- milstd2525/icons/war/sugpuuscl------.svg | 28 +- milstd2525/icons/war/sugpuusf-------.svg | 28 +- milstd2525/icons/war/sugpuusm-------.svg | 28 +- milstd2525/icons/war/sugpuusml------.svg | 28 +- milstd2525/icons/war/sugpuusmn------.svg | 28 +- milstd2525/icons/war/sugpuusms------.svg | 28 +- milstd2525/icons/war/sugpuuso-------.svg | 28 +- milstd2525/icons/war/sugpuusr-------.svg | 28 +- milstd2525/icons/war/sugpuusrs------.svg | 28 +- milstd2525/icons/war/sugpuusrt------.svg | 28 +- milstd2525/icons/war/sugpuusrw------.svg | 28 +- milstd2525/icons/war/sugpuuss-------.svg | 28 +- milstd2525/icons/war/sugpuusw-------.svg | 28 +- milstd2525/icons/war/sugpuusx-------.svg | 28 +- milstd2525/icons/war/supa-----------.svg | 28 +- milstd2525/icons/war/supal----------.svg | 28 +- milstd2525/icons/war/supas----------.svg | 28 +- milstd2525/icons/war/supat----------.svg | 28 +- milstd2525/icons/war/supav----------.svg | 28 +- milstd2525/icons/war/supp-----------.svg | 28 +- milstd2525/icons/war/suppl----------.svg | 28 +- milstd2525/icons/war/supps----------.svg | 28 +- milstd2525/icons/war/suppt----------.svg | 28 +- milstd2525/icons/war/suppv----------.svg | 28 +- milstd2525/icons/war/susa-----------.svg | 28 +- milstd2525/icons/war/susac----------.svg | 28 +- milstd2525/icons/war/susaca---------.svg | 28 +- milstd2525/icons/war/susacala-------.svg | 28 +- milstd2525/icons/war/susacalc-------.svg | 28 +- milstd2525/icons/war/susacals-------.svg | 28 +- milstd2525/icons/war/susacalsm------.svg | 28 +- milstd2525/icons/war/susacalst------.svg | 28 +- milstd2525/icons/war/susacd---------.svg | 28 +- milstd2525/icons/war/susach---------.svg | 28 +- milstd2525/icons/war/susacl---------.svg | 28 +- milstd2525/icons/war/susaclbb-------.svg | 28 +- milstd2525/icons/war/susaclcc-------.svg | 28 +- milstd2525/icons/war/susaclcv-------.svg | 28 +- milstd2525/icons/war/susacldd-------.svg | 28 +- milstd2525/icons/war/susaclff-------.svg | 28 +- milstd2525/icons/war/susaclll-------.svg | 28 +- milstd2525/icons/war/susaclllas-----.svg | 28 +- milstd2525/icons/war/susaclllmi-----.svg | 28 +- milstd2525/icons/war/susaclllsu-----.svg | 28 +- milstd2525/icons/war/susacm---------.svg | 28 +- milstd2525/icons/war/susacmma-------.svg | 28 +- milstd2525/icons/war/susacmmh-------.svg | 28 +- milstd2525/icons/war/susacmml-------.svg | 28 +- milstd2525/icons/war/susacmms-------.svg | 28 +- milstd2525/icons/war/susacp---------.svg | 28 +- milstd2525/icons/war/susacpsb-------.svg | 28 +- milstd2525/icons/war/susacpsu-------.svg | 28 +- milstd2525/icons/war/susacpsug------.svg | 28 +- milstd2525/icons/war/susacpsum------.svg | 28 +- milstd2525/icons/war/susacpsut------.svg | 28 +- milstd2525/icons/war/susacu---------.svg | 28 +- milstd2525/icons/war/susacum--------.svg | 28 +- milstd2525/icons/war/susacun--------.svg | 28 +- milstd2525/icons/war/susacur--------.svg | 28 +- milstd2525/icons/war/susacus--------.svg | 28 +- milstd2525/icons/war/susag----------.svg | 28 +- milstd2525/icons/war/susagc---------.svg | 28 +- milstd2525/icons/war/susagg---------.svg | 28 +- milstd2525/icons/war/susagt---------.svg | 28 +- milstd2525/icons/war/susagu---------.svg | 28 +- milstd2525/icons/war/susan----------.svg | 28 +- milstd2525/icons/war/susanf---------.svg | 28 +- milstd2525/icons/war/susanh---------.svg | 28 +- milstd2525/icons/war/susani---------.svg | 28 +- milstd2525/icons/war/susanm---------.svg | 28 +- milstd2525/icons/war/susanr---------.svg | 28 +- milstd2525/icons/war/susans---------.svg | 28 +- milstd2525/icons/war/susao----------.svg | 28 +- milstd2525/icons/war/susaxa---------.svg | 28 +- milstd2525/icons/war/susaxar--------.svg | 28 +- milstd2525/icons/war/susaxas--------.svg | 28 +- milstd2525/icons/war/susaxf---------.svg | 28 +- milstd2525/icons/war/susaxfdf-------.svg | 28 +- milstd2525/icons/war/susaxfdr-------.svg | 28 +- milstd2525/icons/war/susaxftr-------.svg | 28 +- milstd2525/icons/war/susaxh---------.svg | 28 +- milstd2525/icons/war/susaxl---------.svg | 28 +- milstd2525/icons/war/susaxm---------.svg | 28 +- milstd2525/icons/war/susaxmc--------.svg | 28 +- milstd2525/icons/war/susaxmf--------.svg | 28 +- milstd2525/icons/war/susaxmh--------.svg | 28 +- milstd2525/icons/war/susaxmo--------.svg | 28 +- milstd2525/icons/war/susaxmp--------.svg | 28 +- milstd2525/icons/war/susaxmr--------.svg | 28 +- milstd2525/icons/war/susaxmto-------.svg | 28 +- milstd2525/icons/war/susaxmtu-------.svg | 28 +- milstd2525/icons/war/susaxp---------.svg | 28 +- milstd2525/icons/war/susaxr---------.svg | 28 +- milstd2525/icons/war/susp-----------.svg | 28 +- milstd2525/icons/war/suspc----------.svg | 28 +- milstd2525/icons/war/suspca---------.svg | 28 +- milstd2525/icons/war/suspcala-------.svg | 28 +- milstd2525/icons/war/suspcalc-------.svg | 28 +- milstd2525/icons/war/suspcals-------.svg | 28 +- milstd2525/icons/war/suspcalsm------.svg | 28 +- milstd2525/icons/war/suspcalst------.svg | 28 +- milstd2525/icons/war/suspcd---------.svg | 28 +- milstd2525/icons/war/suspch---------.svg | 28 +- milstd2525/icons/war/suspcl---------.svg | 28 +- milstd2525/icons/war/suspclbb-------.svg | 28 +- milstd2525/icons/war/suspclcc-------.svg | 28 +- milstd2525/icons/war/suspclcv-------.svg | 28 +- milstd2525/icons/war/suspcldd-------.svg | 28 +- milstd2525/icons/war/suspclff-------.svg | 28 +- milstd2525/icons/war/suspclll-------.svg | 28 +- milstd2525/icons/war/suspclllas-----.svg | 28 +- milstd2525/icons/war/suspclllmi-----.svg | 28 +- milstd2525/icons/war/suspclllsu-----.svg | 28 +- milstd2525/icons/war/suspcm---------.svg | 28 +- milstd2525/icons/war/suspcmma-------.svg | 28 +- milstd2525/icons/war/suspcmmh-------.svg | 28 +- milstd2525/icons/war/suspcmml-------.svg | 28 +- milstd2525/icons/war/suspcmms-------.svg | 28 +- milstd2525/icons/war/suspcp---------.svg | 28 +- milstd2525/icons/war/suspcpsb-------.svg | 28 +- milstd2525/icons/war/suspcpsu-------.svg | 28 +- milstd2525/icons/war/suspcpsug------.svg | 28 +- milstd2525/icons/war/suspcpsum------.svg | 28 +- milstd2525/icons/war/suspcpsut------.svg | 28 +- milstd2525/icons/war/suspcu---------.svg | 28 +- milstd2525/icons/war/suspcum--------.svg | 28 +- milstd2525/icons/war/suspcun--------.svg | 28 +- milstd2525/icons/war/suspcur--------.svg | 28 +- milstd2525/icons/war/suspcus--------.svg | 28 +- milstd2525/icons/war/suspg----------.svg | 28 +- milstd2525/icons/war/suspgc---------.svg | 28 +- milstd2525/icons/war/suspgg---------.svg | 28 +- milstd2525/icons/war/suspgt---------.svg | 28 +- milstd2525/icons/war/suspgu---------.svg | 28 +- milstd2525/icons/war/suspn----------.svg | 28 +- milstd2525/icons/war/suspnf---------.svg | 28 +- milstd2525/icons/war/suspnh---------.svg | 28 +- milstd2525/icons/war/suspni---------.svg | 28 +- milstd2525/icons/war/suspnm---------.svg | 28 +- milstd2525/icons/war/suspnr---------.svg | 28 +- milstd2525/icons/war/suspns---------.svg | 28 +- milstd2525/icons/war/suspo----------.svg | 28 +- milstd2525/icons/war/suspxa---------.svg | 28 +- milstd2525/icons/war/suspxar--------.svg | 28 +- milstd2525/icons/war/suspxas--------.svg | 28 +- milstd2525/icons/war/suspxf---------.svg | 28 +- milstd2525/icons/war/suspxfdf-------.svg | 28 +- milstd2525/icons/war/suspxfdr-------.svg | 28 +- milstd2525/icons/war/suspxftr-------.svg | 28 +- milstd2525/icons/war/suspxh---------.svg | 28 +- milstd2525/icons/war/suspxl---------.svg | 28 +- milstd2525/icons/war/suspxm---------.svg | 28 +- milstd2525/icons/war/suspxmc--------.svg | 28 +- milstd2525/icons/war/suspxmf--------.svg | 28 +- milstd2525/icons/war/suspxmh--------.svg | 28 +- milstd2525/icons/war/suspxmo--------.svg | 28 +- milstd2525/icons/war/suspxmp--------.svg | 28 +- milstd2525/icons/war/suspxmr--------.svg | 28 +- milstd2525/icons/war/suspxmto-------.svg | 28 +- milstd2525/icons/war/suspxmtu-------.svg | 28 +- milstd2525/icons/war/suspxp---------.svg | 28 +- milstd2525/icons/war/suspxr---------.svg | 28 +- milstd2525/icons/war/suua-----------.svg | 28 +- milstd2525/icons/war/suuae----------.svg | 28 +- milstd2525/icons/war/suuand---------.svg | 28 +- milstd2525/icons/war/suuas----------.svg | 28 +- milstd2525/icons/war/suuas1---------.svg | 28 +- milstd2525/icons/war/suuas2---------.svg | 28 +- milstd2525/icons/war/suuas3---------.svg | 28 +- milstd2525/icons/war/suuas4---------.svg | 28 +- milstd2525/icons/war/suuasb---------.svg | 28 +- milstd2525/icons/war/suuasc---------.svg | 28 +- milstd2525/icons/war/suuasca--------.svg | 28 +- milstd2525/icons/war/suuascb--------.svg | 28 +- milstd2525/icons/war/suuascf--------.svg | 28 +- milstd2525/icons/war/suuascg--------.svg | 28 +- milstd2525/icons/war/suuascm--------.svg | 28 +- milstd2525/icons/war/suuasf---------.svg | 28 +- milstd2525/icons/war/suuask---------.svg | 28 +- milstd2525/icons/war/suuasl---------.svg | 28 +- milstd2525/icons/war/suuasn---------.svg | 28 +- milstd2525/icons/war/suuasna--------.svg | 28 +- milstd2525/icons/war/suuasnb--------.svg | 28 +- milstd2525/icons/war/suuasnf--------.svg | 28 +- milstd2525/icons/war/suuasng--------.svg | 28 +- milstd2525/icons/war/suuasnm--------.svg | 28 +- milstd2525/icons/war/suuaso---------.svg | 28 +- milstd2525/icons/war/suuasof--------.svg | 28 +- milstd2525/icons/war/suuasr---------.svg | 28 +- milstd2525/icons/war/suuasu---------.svg | 28 +- milstd2525/icons/war/suuasum--------.svg | 28 +- milstd2525/icons/war/suuasun--------.svg | 28 +- milstd2525/icons/war/suuasus--------.svg | 28 +- milstd2525/icons/war/suuasx---------.svg | 28 +- milstd2525/icons/war/suuav----------.svg | 28 +- milstd2525/icons/war/suuaw----------.svg | 28 +- milstd2525/icons/war/suuawd---------.svg | 28 +- milstd2525/icons/war/suuawdm--------.svg | 28 +- milstd2525/icons/war/suuawdmg-------.svg | 28 +- milstd2525/icons/war/suuawdmm-------.svg | 28 +- milstd2525/icons/war/suuawm---------.svg | 28 +- milstd2525/icons/war/suuawma--------.svg | 28 +- milstd2525/icons/war/suuawmb--------.svg | 28 +- milstd2525/icons/war/suuawmbd-------.svg | 28 +- milstd2525/icons/war/suuawmc--------.svg | 28 +- milstd2525/icons/war/suuawmd--------.svg | 28 +- milstd2525/icons/war/suuawme--------.svg | 28 +- milstd2525/icons/war/suuawmf--------.svg | 28 +- milstd2525/icons/war/suuawmfc-------.svg | 28 +- milstd2525/icons/war/suuawmfd-------.svg | 28 +- milstd2525/icons/war/suuawmfe-------.svg | 28 +- milstd2525/icons/war/suuawmfo-------.svg | 28 +- milstd2525/icons/war/suuawmfr-------.svg | 28 +- milstd2525/icons/war/suuawmfx-------.svg | 28 +- milstd2525/icons/war/suuawmg--------.svg | 28 +- milstd2525/icons/war/suuawmgc-------.svg | 28 +- milstd2525/icons/war/suuawmgd-------.svg | 28 +- milstd2525/icons/war/suuawmge-------.svg | 28 +- milstd2525/icons/war/suuawmgo-------.svg | 28 +- milstd2525/icons/war/suuawmgr-------.svg | 28 +- milstd2525/icons/war/suuawmgx-------.svg | 28 +- milstd2525/icons/war/suuawmm--------.svg | 28 +- milstd2525/icons/war/suuawmmc-------.svg | 28 +- milstd2525/icons/war/suuawmmd-------.svg | 28 +- milstd2525/icons/war/suuawmme-------.svg | 28 +- milstd2525/icons/war/suuawmmo-------.svg | 28 +- milstd2525/icons/war/suuawmmr-------.svg | 28 +- milstd2525/icons/war/suuawmmx-------.svg | 28 +- milstd2525/icons/war/suuawmn--------.svg | 28 +- milstd2525/icons/war/suuawmo--------.svg | 28 +- milstd2525/icons/war/suuawmod-------.svg | 28 +- milstd2525/icons/war/suuawmr--------.svg | 28 +- milstd2525/icons/war/suuawms--------.svg | 28 +- milstd2525/icons/war/suuawmsd-------.svg | 28 +- milstd2525/icons/war/suuawmsx-------.svg | 28 +- milstd2525/icons/war/suuawmx--------.svg | 28 +- milstd2525/icons/war/suuawt---------.svg | 28 +- milstd2525/icons/war/suuax----------.svg | 28 +- milstd2525/icons/war/suup-----------.svg | 28 +- milstd2525/icons/war/suupe----------.svg | 28 +- milstd2525/icons/war/suupnd---------.svg | 28 +- milstd2525/icons/war/suups----------.svg | 28 +- milstd2525/icons/war/suups1---------.svg | 28 +- milstd2525/icons/war/suups2---------.svg | 28 +- milstd2525/icons/war/suups3---------.svg | 28 +- milstd2525/icons/war/suups4---------.svg | 28 +- milstd2525/icons/war/suupsb---------.svg | 28 +- milstd2525/icons/war/suupsc---------.svg | 28 +- milstd2525/icons/war/suupsca--------.svg | 28 +- milstd2525/icons/war/suupscb--------.svg | 28 +- milstd2525/icons/war/suupscf--------.svg | 28 +- milstd2525/icons/war/suupscg--------.svg | 28 +- milstd2525/icons/war/suupscm--------.svg | 28 +- milstd2525/icons/war/suupsf---------.svg | 28 +- milstd2525/icons/war/suupsk---------.svg | 28 +- milstd2525/icons/war/suupsl---------.svg | 28 +- milstd2525/icons/war/suupsn---------.svg | 28 +- milstd2525/icons/war/suupsna--------.svg | 28 +- milstd2525/icons/war/suupsnb--------.svg | 28 +- milstd2525/icons/war/suupsnf--------.svg | 28 +- milstd2525/icons/war/suupsng--------.svg | 28 +- milstd2525/icons/war/suupsnm--------.svg | 28 +- milstd2525/icons/war/suupso---------.svg | 28 +- milstd2525/icons/war/suupsof--------.svg | 28 +- milstd2525/icons/war/suupsr---------.svg | 28 +- milstd2525/icons/war/suupsu---------.svg | 28 +- milstd2525/icons/war/suupsum--------.svg | 28 +- milstd2525/icons/war/suupsun--------.svg | 28 +- milstd2525/icons/war/suupsus--------.svg | 28 +- milstd2525/icons/war/suupsx---------.svg | 28 +- milstd2525/icons/war/suupv----------.svg | 28 +- milstd2525/icons/war/suupw----------.svg | 28 +- milstd2525/icons/war/suupwd---------.svg | 28 +- milstd2525/icons/war/suupwdm--------.svg | 28 +- milstd2525/icons/war/suupwdmg-------.svg | 28 +- milstd2525/icons/war/suupwdmm-------.svg | 28 +- milstd2525/icons/war/suupwm---------.svg | 28 +- milstd2525/icons/war/suupwma--------.svg | 28 +- milstd2525/icons/war/suupwmb--------.svg | 28 +- milstd2525/icons/war/suupwmbd-------.svg | 28 +- milstd2525/icons/war/suupwmc--------.svg | 28 +- milstd2525/icons/war/suupwmd--------.svg | 28 +- milstd2525/icons/war/suupwme--------.svg | 28 +- milstd2525/icons/war/suupwmf--------.svg | 28 +- milstd2525/icons/war/suupwmfc-------.svg | 28 +- milstd2525/icons/war/suupwmfd-------.svg | 28 +- milstd2525/icons/war/suupwmfe-------.svg | 28 +- milstd2525/icons/war/suupwmfo-------.svg | 28 +- milstd2525/icons/war/suupwmfr-------.svg | 28 +- milstd2525/icons/war/suupwmfx-------.svg | 28 +- milstd2525/icons/war/suupwmg--------.svg | 28 +- milstd2525/icons/war/suupwmgc-------.svg | 28 +- milstd2525/icons/war/suupwmgd-------.svg | 28 +- milstd2525/icons/war/suupwmge-------.svg | 28 +- milstd2525/icons/war/suupwmgo-------.svg | 28 +- milstd2525/icons/war/suupwmgr-------.svg | 28 +- milstd2525/icons/war/suupwmgx-------.svg | 28 +- milstd2525/icons/war/suupwmm--------.svg | 28 +- milstd2525/icons/war/suupwmmc-------.svg | 28 +- milstd2525/icons/war/suupwmmd-------.svg | 28 +- milstd2525/icons/war/suupwmme-------.svg | 28 +- milstd2525/icons/war/suupwmmo-------.svg | 28 +- milstd2525/icons/war/suupwmmr-------.svg | 28 +- milstd2525/icons/war/suupwmmx-------.svg | 28 +- milstd2525/icons/war/suupwmn--------.svg | 28 +- milstd2525/icons/war/suupwmo--------.svg | 28 +- milstd2525/icons/war/suupwmod-------.svg | 28 +- milstd2525/icons/war/suupwmr--------.svg | 28 +- milstd2525/icons/war/suupwms--------.svg | 28 +- milstd2525/icons/war/suupwmsd-------.svg | 28 +- milstd2525/icons/war/suupwmsx-------.svg | 28 +- milstd2525/icons/war/suupwmx--------.svg | 28 +- milstd2525/icons/war/suupwt---------.svg | 28 +- milstd2525/icons/war/suupx----------.svg | 28 +- nbproject/build-impl.xml | 1770 +++++++++++++++++ nbproject/configs/AirspaceBuilder.properties | 1 + .../configs/ApplicationTemplate.properties | 1 + nbproject/configs/Balloons.properties | 1 + .../configs/ContextMenusOnShapes.properties | 1 + nbproject/configs/ContourLines.properties | 1 + nbproject/configs/DataInstallerApp.properties | 1 + .../configs/DebuggingGLErrors.properties | 1 + nbproject/configs/DraggingShapes.properties | 1 + nbproject/configs/ExtrudedShapes.properties | 1 + nbproject/configs/FlatWorld.properties | 1 + nbproject/configs/GeoRSS.properties | 1 + .../configs/GetBestElevations.properties | 1 + nbproject/configs/GliderTestApp.properties | 1 + nbproject/configs/Graticule.properties | 1 + nbproject/configs/ImportImagery.properties | 1 + nbproject/configs/KMLViewer.properties | 1 + .../configs/KeepObjectsInView.properties | 1 + nbproject/configs/LayerManagerApp.properties | 1 + nbproject/configs/LineBackground.properties | 1 + nbproject/configs/LineBuilder.properties | 1 + nbproject/configs/LinesOfSight.properties | 1 + nbproject/configs/LoggingControl.properties | 1 + nbproject/configs/MeasureToolUsage.properties | 1 + nbproject/configs/MultiFrame.properties | 1 + nbproject/configs/MultiResPath.properties | 1 + nbproject/configs/Paths.properties | 1 + nbproject/configs/SARApp.properties | 1 + nbproject/configs/Shapes.properties | 1 + nbproject/configs/Shutdown.properties | 1 + nbproject/configs/SurfaceImages.properties | 1 + .../configs/TerrainIntersections.properties | 1 + nbproject/configs/TerrainProfiler.properties | 1 + nbproject/configs/ViewControls.properties | 1 + nbproject/configs/ViewLookAround.properties | 1 + nbproject/configs/WMSLayerManager.properties | 1 + .../configs/WorldWindDiagnostics.properties | 1 + nbproject/configs/WorldWindow.properties | 1 + nbproject/genfiles.properties | 8 + nbproject/project.properties | 124 ++ nbproject/project.xml | 16 + build.macros.xml => release-build.macros.xml | 60 +- release-build.properties | 50 + release-build.xml | 404 ++++ run-demo.bash | 28 +- run-demo.bat | 28 +- src/com/zebraimaging/ZebraInputHandler.java | 4 +- src/config/DataFileStore.xml | 32 +- src/config/Earth/AlaskaFAASectionals.xml | 28 +- src/config/Earth/AsterWCS.xml | 28 +- src/config/Earth/BMNG256.xml | 28 +- src/config/Earth/BMNGWMSLayer.xml | 28 +- src/config/Earth/BMNGWMSLayer2.xml | 28 +- src/config/Earth/BingImagery.xml | 28 +- src/config/Earth/CountryBoundariesLayer.xml | 28 +- src/config/Earth/EarthAtNightLayer.xml | 28 +- .../Earth/EarthElevationModelAsBil16.xml | 28 +- .../Earth/EarthElevationModelAsBil32.xml | 28 +- src/config/Earth/EarthElevations2.xml | 28 +- src/config/Earth/EarthElevations256.xml | 28 +- .../Earth/EarthMergedElevationModel.xml | 28 +- src/config/Earth/Landsat256.xml | 28 +- src/config/Earth/LandsatI3WMSLayer.xml | 28 +- src/config/Earth/LandsatI3WMSLayer2.xml | 28 +- .../Earth/MSVirtualEarthAerialLayer.xml | 28 +- .../Earth/MSVirtualEarthHybridLayer.xml | 28 +- src/config/Earth/MSVirtualEarthRoadsLayer.xml | 28 +- src/config/Earth/OpenStreetMap.xml | 28 +- .../ScankortDenmarkDSMElevationModel.xml | 43 - .../Earth/ScankortDenmarkImageLayer.xml | 49 - .../Earth/USDANAIPUSGSWMSImageLayer.xml | 28 +- src/config/Earth/USDANAIPWMSImageLayer.xml | 28 +- src/config/Earth/USGSDigitalOrthoLayer.xml | 28 +- src/config/Earth/USGSNAIPPlusLayer.xml | 28 +- src/config/Earth/USGSTNMTopoLargeLayer.xml | 28 +- src/config/Earth/USGSTNMTopoLayer.xml | 28 +- src/config/Earth/USGSTopoHighResLayer.xml | 28 +- src/config/Earth/USGSTopoLowResLayer.xml | 28 +- src/config/Earth/USGSTopoMedResLayer.xml | 28 +- src/config/Earth/USGSUrbanAreaOrthoLayer.xml | 28 +- src/config/Earth/WorldBordersShapefile.xml | 28 +- src/config/WMSLayerTemplate.xml | 28 +- src/config/worldwind.layers.xml | 32 +- src/config/worldwind.xml | 34 +- .../worldwind/AbstractSceneController.java | 32 +- src/gov/nasa/worldwind/BasicFactory.java | 30 +- src/gov/nasa/worldwind/BasicModel.java | 31 +- .../nasa/worldwind/BasicSceneController.java | 28 +- src/gov/nasa/worldwind/Configuration.java | 79 +- src/gov/nasa/worldwind/Disposable.java | 28 +- src/gov/nasa/worldwind/Exportable.java | 32 +- src/gov/nasa/worldwind/Factory.java | 28 +- src/gov/nasa/worldwind/Locatable.java | 28 +- src/gov/nasa/worldwind/Model.java | 28 +- src/gov/nasa/worldwind/Movable.java | 28 +- src/gov/nasa/worldwind/Movable2.java | 28 +- src/gov/nasa/worldwind/Restorable.java | 28 +- src/gov/nasa/worldwind/SceneController.java | 32 +- .../StereoOptionSceneController.java | 43 +- .../nasa/worldwind/StereoSceneController.java | 34 +- src/gov/nasa/worldwind/Version.java | 55 +- src/gov/nasa/worldwind/View.java | 52 +- src/gov/nasa/worldwind/WWObject.java | 30 +- src/gov/nasa/worldwind/WWObjectImpl.java | 28 +- src/gov/nasa/worldwind/WorldWind.java | 58 +- src/gov/nasa/worldwind/WorldWindow.java | 78 +- .../worldwind/WorldWindowGLAutoDrawable.java | 45 +- .../nasa/worldwind/WorldWindowGLDrawable.java | 30 +- src/gov/nasa/worldwind/WorldWindowImpl.java | 59 +- .../worldwind/animation/AngleAnimator.java | 28 +- .../animation/AnimationController.java | 28 +- .../worldwind/animation/AnimationSupport.java | 30 +- .../nasa/worldwind/animation/Animator.java | 28 +- .../worldwind/animation/BasicAnimator.java | 28 +- .../worldwind/animation/CompoundAnimator.java | 28 +- .../worldwind/animation/DoubleAnimator.java | 28 +- .../worldwind/animation/Interpolator.java | 28 +- .../animation/MoveToDoubleAnimator.java | 28 +- .../animation/MoveToPositionAnimator.java | 28 +- .../worldwind/animation/PositionAnimator.java | 28 +- .../animation/RotateToAngleAnimator.java | 28 +- .../animation/ScheduledInterpolator.java | 28 +- .../animation/SmoothInterpolator.java | 28 +- src/gov/nasa/worldwind/avlist/AVKey.java | 32 +- src/gov/nasa/worldwind/avlist/AVList.java | 28 +- src/gov/nasa/worldwind/avlist/AVListImpl.java | 30 +- .../nasa/worldwind/awt/AWTInputHandler.java | 32 +- .../awt/AbstractViewInputHandler.java | 30 +- .../worldwind/awt/BasicViewInputHandler.java | 28 +- src/gov/nasa/worldwind/awt/KeyEventState.java | 223 ++- .../worldwind/awt/KeyInputActionHandler.java | 28 +- .../awt/MouseInputActionHandler.java | 28 +- .../worldwind/awt/ViewInputActionHandler.java | 28 +- .../worldwind/awt/ViewInputAttributes.java | 28 +- .../nasa/worldwind/awt/ViewInputHandler.java | 28 +- .../worldwind/awt/WorldWindowGLCanvas.java | 61 +- .../worldwind/awt/WorldWindowGLJPanel.java | 55 +- .../worldwind/cache/AbstractFileStore.java | 30 +- .../worldwind/cache/BasicDataFileStore.java | 66 +- .../cache/BasicGpuResourceCache.java | 36 +- .../worldwind/cache/BasicMemoryCache.java | 50 +- .../worldwind/cache/BasicMemoryCacheSet.java | 28 +- .../cache/BasicRasterServerCache.java | 30 +- .../worldwind/cache/BasicSessionCache.java | 32 +- src/gov/nasa/worldwind/cache/Cacheable.java | 28 +- src/gov/nasa/worldwind/cache/FileStore.java | 44 +- .../nasa/worldwind/cache/FileStoreFilter.java | 28 +- .../worldwind/cache/GpuResourceCache.java | 28 +- src/gov/nasa/worldwind/cache/MemoryCache.java | 38 +- .../nasa/worldwind/cache/MemoryCacheSet.java | 28 +- .../nasa/worldwind/cache/SessionCache.java | 30 +- .../nasa/worldwind/cache/ShapeDataCache.java | 32 +- .../worldwind/data/AbstractDataRaster.java | 34 +- .../data/AbstractDataRasterReader.java | 28 +- .../data/AbstractDataRasterWriter.java | 28 +- .../data/AbstractDataStoreProducer.java | 28 +- .../nasa/worldwind/data/BILRasterReader.java | 28 +- .../nasa/worldwind/data/BILRasterWriter.java | 28 +- .../data/BasicDataRasterReaderFactory.java | 32 +- .../worldwind/data/BasicRasterServer.java | 34 +- .../worldwind/data/BufferWrapperRaster.java | 30 +- .../worldwind/data/BufferedImageRaster.java | 28 +- .../nasa/worldwind/data/ByteBufferRaster.java | 28 +- .../nasa/worldwind/data/CachedDataRaster.java | 30 +- .../nasa/worldwind/data/DDSRasterReader.java | 28 +- .../nasa/worldwind/data/DDSRasterWriter.java | 28 +- .../nasa/worldwind/data/DTEDRasterReader.java | 28 +- src/gov/nasa/worldwind/data/DataRaster.java | 28 +- .../nasa/worldwind/data/DataRasterReader.java | 48 +- .../data/DataRasterReaderFactory.java | 30 +- .../nasa/worldwind/data/DataRasterWriter.java | 28 +- .../worldwind/data/DataStoreProducer.java | 28 +- src/gov/nasa/worldwind/data/GDAL.java | 28 +- .../nasa/worldwind/data/GDALDataRaster.java | 54 +- .../worldwind/data/GDALDataRasterReader.java | 28 +- src/gov/nasa/worldwind/data/GDALMetadata.java | 28 +- .../worldwind/data/GeotiffRasterReader.java | 28 +- .../worldwind/data/GeotiffRasterWriter.java | 28 +- .../worldwind/data/ImageIORasterReader.java | 28 +- .../worldwind/data/ImageIORasterWriter.java | 28 +- .../data/MipMappedBufferedImageRaster.java | 28 +- .../nasa/worldwind/data/RPFRasterReader.java | 28 +- src/gov/nasa/worldwind/data/RasterServer.java | 30 +- .../data/RasterServerConfiguration.java | 28 +- .../data/TiledElevationProducer.java | 28 +- .../worldwind/data/TiledImageProducer.java | 28 +- .../worldwind/data/TiledRasterProducer.java | 46 +- .../data/WWDotNetLayerSetConverter.java | 28 +- src/gov/nasa/worldwind/data/package-info.java | 817 ++++++++ src/gov/nasa/worldwind/data/package.html | 805 -------- src/gov/nasa/worldwind/drag/DragContext.java | 28 +- src/gov/nasa/worldwind/drag/Draggable.java | 28 +- .../nasa/worldwind/drag/DraggableSupport.java | 28 +- .../worldwind/event/BulkRetrievalEvent.java | 28 +- .../event/BulkRetrievalListener.java | 28 +- .../nasa/worldwind/event/DragSelectEvent.java | 28 +- .../nasa/worldwind/event/InputHandler.java | 28 +- src/gov/nasa/worldwind/event/Message.java | 28 +- .../nasa/worldwind/event/MessageListener.java | 28 +- .../worldwind/event/NoOpInputHandler.java | 28 +- .../nasa/worldwind/event/PositionEvent.java | 28 +- .../worldwind/event/PositionListener.java | 28 +- .../nasa/worldwind/event/RenderingEvent.java | 28 +- .../event/RenderingExceptionListener.java | 28 +- .../worldwind/event/RenderingListener.java | 28 +- src/gov/nasa/worldwind/event/SelectEvent.java | 40 +- .../nasa/worldwind/event/SelectListener.java | 28 +- src/gov/nasa/worldwind/event/WWEvent.java | 32 +- .../worldwind/exception/NoItemException.java | 28 +- .../worldwind/exception/ServiceException.java | 28 +- .../WWAbsentRequirementException.java | 28 +- .../exception/WWRuntimeException.java | 28 +- .../exception/WWTimeoutException.java | 30 +- .../exception/WWUnrecognizedException.java | 28 +- .../nasa/worldwind/formats/csv/CSVReader.java | 38 +- .../worldwind/formats/csv/CSVTrackPoint.java | 34 +- .../nasa/worldwind/formats/csv/CSVWriter.java | 28 +- .../worldwind/formats/dds/AlphaBlockDXT3.java | 30 +- .../formats/dds/BasicColorBlockExtractor.java | 28 +- .../nasa/worldwind/formats/dds/BlockDXT1.java | 30 +- .../formats/dds/BlockDXT1Compressor.java | 28 +- .../nasa/worldwind/formats/dds/BlockDXT3.java | 30 +- .../formats/dds/BlockDXT3Compressor.java | 32 +- .../nasa/worldwind/formats/dds/Color24.java | 28 +- .../nasa/worldwind/formats/dds/Color32.java | 28 +- .../worldwind/formats/dds/ColorBlock4x4.java | 28 +- .../formats/dds/ColorBlockExtractor.java | 28 +- .../worldwind/formats/dds/DDSCompressor.java | 32 +- .../worldwind/formats/dds/DDSConstants.java | 28 +- .../formats/dds/DDSDecompressor.java | 28 +- .../nasa/worldwind/formats/dds/DDSHeader.java | 30 +- .../worldwind/formats/dds/DDSPixelFormat.java | 28 +- .../worldwind/formats/dds/DXT1Compressor.java | 28 +- .../formats/dds/DXT1Decompressor.java | 28 +- .../worldwind/formats/dds/DXT3Compressor.java | 28 +- .../formats/dds/DXT3Decompressor.java | 28 +- .../formats/dds/DXTCompressionAttributes.java | 28 +- .../worldwind/formats/dds/DXTCompressor.java | 28 +- .../formats/dds/DXTDecompressor.java | 30 +- .../formats/dds/StandaloneDDSConverter.java | 28 +- src/gov/nasa/worldwind/formats/dted/DTED.java | 28 +- .../worldwind/formats/gcps/GCPSReader.java | 28 +- .../formats/geojson/GeoJSONConstants.java | 28 +- .../geojson/GeoJSONCoordinateParser.java | 28 +- .../worldwind/formats/geojson/GeoJSONDoc.java | 28 +- .../formats/geojson/GeoJSONEventParser.java | 28 +- .../geojson/GeoJSONEventParserContext.java | 28 +- .../formats/geojson/GeoJSONFeature.java | 28 +- .../geojson/GeoJSONFeatureCollection.java | 28 +- .../formats/geojson/GeoJSONGeometry.java | 28 +- .../geojson/GeoJSONGeometryCollection.java | 28 +- .../formats/geojson/GeoJSONLineString.java | 28 +- .../geojson/GeoJSONMultiLineString.java | 28 +- .../formats/geojson/GeoJSONMultiPoint.java | 28 +- .../formats/geojson/GeoJSONMultiPolygon.java | 28 +- .../formats/geojson/GeoJSONObject.java | 28 +- .../formats/geojson/GeoJSONPoint.java | 28 +- .../formats/geojson/GeoJSONPolygon.java | 28 +- .../formats/geojson/GeoJSONPositionArray.java | 28 +- .../formats/georss/GeoRSSParser.java | 555 +++--- .../worldwind/formats/gpx/ElementParser.java | 52 +- .../nasa/worldwind/formats/gpx/GpxReader.java | 38 +- .../nasa/worldwind/formats/gpx/GpxRoute.java | 28 +- .../worldwind/formats/gpx/GpxRoutePoint.java | 28 +- .../nasa/worldwind/formats/gpx/GpxTrack.java | 46 +- .../worldwind/formats/gpx/GpxTrackPoint.java | 42 +- .../formats/gpx/GpxTrackSegment.java | 38 +- .../nasa/worldwind/formats/gpx/GpxWriter.java | 30 +- .../formats/json/BasicJSONEvent.java | 28 +- .../formats/json/BasicJSONEventParser.java | 28 +- .../json/BasicJSONEventParserContext.java | 28 +- .../nasa/worldwind/formats/json/JSONDoc.java | 28 +- .../worldwind/formats/json/JSONEvent.java | 28 +- .../formats/json/JSONEventParser.java | 28 +- .../formats/json/JSONEventParserContext.java | 28 +- .../formats/json/NumericValueJSONEvent.java | 28 +- .../nitfs/CompressionLookupRecord.java | 28 +- .../nitfs/NITFSDataExtensionSegment.java | 28 +- .../nitfs/NITFSExtendedHeaderSegment.java | 28 +- .../formats/nitfs/NITFSFileHeader.java | 28 +- .../formats/nitfs/NITFSImageBand.java | 28 +- .../formats/nitfs/NITFSImageSegment.java | 28 +- .../formats/nitfs/NITFSLabelSegment.java | 28 +- .../worldwind/formats/nitfs/NITFSMessage.java | 28 +- .../nitfs/NITFSReservedExtensionSegment.java | 28 +- .../formats/nitfs/NITFSRuntimeException.java | 28 +- .../worldwind/formats/nitfs/NITFSSegment.java | 28 +- .../formats/nitfs/NITFSSegmentType.java | 28 +- .../formats/nitfs/NITFSSymbolSegment.java | 28 +- .../formats/nitfs/NITFSTextSegment.java | 28 +- .../nitfs/NITFSUserDefinedHeaderSegment.java | 28 +- .../worldwind/formats/nitfs/NITFSUtil.java | 28 +- .../nitfs/UserDefinedImageSubheader.java | 28 +- .../worldwind/formats/nmea/NmeaReader.java | 38 +- .../formats/nmea/NmeaTrackPoint.java | 34 +- .../worldwind/formats/nmea/NmeaWriter.java | 28 +- .../formats/rpf/Base34Converter.java | 28 +- .../rpf/RPFBoundingRectangleSection.java | 28 +- .../worldwind/formats/rpf/RPFColorMap.java | 28 +- .../worldwind/formats/rpf/RPFCrawler.java | 28 +- .../worldwind/formats/rpf/RPFDataSeries.java | 28 +- .../nasa/worldwind/formats/rpf/RPFFile.java | 28 +- .../formats/rpf/RPFFileComponents.java | 28 +- .../formats/rpf/RPFFrameFileComponents.java | 28 +- .../formats/rpf/RPFFrameFileIndexSection.java | 28 +- .../formats/rpf/RPFFrameFilename.java | 48 +- .../rpf/RPFFrameFilenameFormatException.java | 28 +- .../formats/rpf/RPFFrameProperty.java | 28 +- .../formats/rpf/RPFFrameStructure.java | 28 +- .../formats/rpf/RPFFrameTransform.java | 28 +- .../formats/rpf/RPFHeaderSection.java | 28 +- .../worldwind/formats/rpf/RPFImageFile.java | 28 +- .../worldwind/formats/rpf/RPFImageType.java | 28 +- .../formats/rpf/RPFLocationSection.java | 28 +- .../rpf/RPFNonpolarFrameStructure.java | 28 +- .../rpf/RPFNonpolarFrameTransform.java | 28 +- .../formats/rpf/RPFPolarFrameStructure.java | 28 +- .../formats/rpf/RPFPolarFrameTransform.java | 28 +- .../worldwind/formats/rpf/RPFProducer.java | 28 +- .../worldwind/formats/rpf/RPFTOCFile.java | 28 +- .../rpf/RPFUserDefinedHeaderSegment.java | 28 +- .../nasa/worldwind/formats/rpf/RPFZone.java | 28 +- .../formats/shapefile/DBaseField.java | 28 +- .../formats/shapefile/DBaseFile.java | 34 +- .../formats/shapefile/DBaseRecord.java | 28 +- .../formats/shapefile/Shapefile.java | 100 +- .../shapefile/ShapefileExtrudedPolygons.java | 30 +- .../shapefile/ShapefileLayerFactory.java | 67 +- .../formats/shapefile/ShapefilePolygons.java | 36 +- .../formats/shapefile/ShapefilePolylines.java | 32 +- .../formats/shapefile/ShapefileRecord.java | 34 +- .../shapefile/ShapefileRecordMultiPoint.java | 42 +- .../shapefile/ShapefileRecordNull.java | 40 +- .../shapefile/ShapefileRecordPoint.java | 42 +- .../shapefile/ShapefileRecordPolygon.java | 42 +- .../shapefile/ShapefileRecordPolyline.java | 42 +- .../shapefile/ShapefileRenderable.java | 32 +- .../formats/shapefile/ShapefileUtils.java | 28 +- .../formats/tab/TABRasterReader.java | 30 +- .../worldwind/formats/tiff/BaselineTiff.java | 28 +- .../nasa/worldwind/formats/tiff/GeoCodec.java | 34 +- .../nasa/worldwind/formats/tiff/GeoTiff.java | 28 +- .../formats/tiff/GeotiffImageReader.java | 30 +- .../formats/tiff/GeotiffImageReaderSpi.java | 28 +- .../formats/tiff/GeotiffMetaData.java | 28 +- .../formats/tiff/GeotiffMetadataFormat.java | 28 +- .../worldwind/formats/tiff/GeotiffReader.java | 652 ++---- .../worldwind/formats/tiff/GeotiffWriter.java | 30 +- .../formats/tiff/TIFFIFDFactory.java | 28 +- .../worldwind/formats/tiff/TIFFReader.java | 28 +- src/gov/nasa/worldwind/formats/tiff/Tiff.java | 28 +- .../worldwind/formats/tiff/TiffIFDEntry.java | 28 +- .../vpf/GeoSymAbbreviationProvider.java | 28 +- .../formats/vpf/GeoSymAssignment.java | 28 +- .../formats/vpf/GeoSymAttributeConverter.java | 38 +- .../vpf/GeoSymAttributeExpression.java | 28 +- .../GeoSymAttributeExpressionProvider.java | 30 +- .../worldwind/formats/vpf/GeoSymColumn.java | 28 +- .../formats/vpf/GeoSymConstants.java | 28 +- .../formats/vpf/GeoSymStyleProvider.java | 28 +- .../worldwind/formats/vpf/GeoSymSupport.java | 30 +- .../worldwind/formats/vpf/GeoSymTable.java | 28 +- .../formats/vpf/GeoSymTableHeader.java | 28 +- .../formats/vpf/GeoSymTableReader.java | 28 +- .../worldwind/formats/vpf/NIMAConstants.java | 28 +- .../nasa/worldwind/formats/vpf/NIMAUtils.java | 28 +- .../vpf/VPFBasicDataBufferFactory.java | 28 +- .../vpf/VPFBasicFeatureClassFactory.java | 28 +- .../formats/vpf/VPFBasicFeatureFactory.java | 28 +- .../vpf/VPFBasicPrimitiveDataFactory.java | 28 +- .../formats/vpf/VPFBasicSymbolFactory.java | 70 +- .../worldwind/formats/vpf/VPFBoundingBox.java | 28 +- .../formats/vpf/VPFBufferedRecordData.java | 28 +- .../worldwind/formats/vpf/VPFConstants.java | 28 +- .../worldwind/formats/vpf/VPFCoverage.java | 30 +- .../formats/vpf/VPFCoveragePanel.java | 28 +- .../worldwind/formats/vpf/VPFDataBuffer.java | 28 +- .../formats/vpf/VPFDataBufferFactory.java | 28 +- .../worldwind/formats/vpf/VPFDataType.java | 28 +- .../worldwind/formats/vpf/VPFDatabase.java | 30 +- .../formats/vpf/VPFDatabaseFilter.java | 28 +- .../worldwind/formats/vpf/VPFFeature.java | 28 +- .../formats/vpf/VPFFeatureClass.java | 28 +- .../formats/vpf/VPFFeatureClassFactory.java | 28 +- .../formats/vpf/VPFFeatureClassSchema.java | 28 +- .../formats/vpf/VPFFeatureFactory.java | 28 +- .../formats/vpf/VPFFeatureTableFilter.java | 28 +- .../worldwind/formats/vpf/VPFFeatureType.java | 28 +- .../nasa/worldwind/formats/vpf/VPFLayer.java | 28 +- .../formats/vpf/VPFLegendSupport.java | 28 +- .../worldwind/formats/vpf/VPFLibrary.java | 28 +- .../formats/vpf/VPFPrimitiveData.java | 28 +- .../formats/vpf/VPFPrimitiveDataFactory.java | 28 +- .../nasa/worldwind/formats/vpf/VPFRecord.java | 28 +- .../worldwind/formats/vpf/VPFRelation.java | 28 +- .../worldwind/formats/vpf/VPFSurfaceArea.java | 32 +- .../worldwind/formats/vpf/VPFSurfaceLine.java | 30 +- .../nasa/worldwind/formats/vpf/VPFSymbol.java | 28 +- .../formats/vpf/VPFSymbolAttributes.java | 28 +- .../formats/vpf/VPFSymbolComparator.java | 50 +- .../formats/vpf/VPFSymbolFactory.java | 28 +- .../worldwind/formats/vpf/VPFSymbolKey.java | 28 +- .../formats/vpf/VPFSymbolSupport.java | 28 +- .../worldwind/formats/vpf/VPFTableReader.java | 30 +- .../nasa/worldwind/formats/vpf/VPFTile.java | 28 +- .../worldwind/formats/vpf/VPFTripletId.java | 28 +- .../nasa/worldwind/formats/vpf/VPFUtils.java | 28 +- .../formats/vpf/VPFWingedEdgeTraverser.java | 34 +- .../formats/worldfile/WorldFile.java | 32 +- .../worldwind/formats/wvt/WaveletCodec.java | 38 +- src/gov/nasa/worldwind/geom/Angle.java | 39 +- .../geom/BarycentricPlanarShape.java | 28 +- .../geom/BarycentricQuadrilateral.java | 28 +- .../worldwind/geom/BarycentricTriangle.java | 28 +- .../worldwind/geom/BilinearInterpolator.java | 28 +- src/gov/nasa/worldwind/geom/Box.java | 93 +- src/gov/nasa/worldwind/geom/Cylinder.java | 32 +- src/gov/nasa/worldwind/geom/Extent.java | 30 +- src/gov/nasa/worldwind/geom/ExtentHolder.java | 28 +- src/gov/nasa/worldwind/geom/Frustum.java | 32 +- src/gov/nasa/worldwind/geom/GeoQuad.java | 28 +- src/gov/nasa/worldwind/geom/Intersection.java | 28 +- src/gov/nasa/worldwind/geom/LatLon.java | 38 +- src/gov/nasa/worldwind/geom/Line.java | 28 +- src/gov/nasa/worldwind/geom/Matrix.java | 58 +- .../nasa/worldwind/geom/MeasurableArea.java | 28 +- .../nasa/worldwind/geom/MeasurableLength.java | 28 +- .../nasa/worldwind/geom/PickPointFrustum.java | 28 +- src/gov/nasa/worldwind/geom/Plane.java | 30 +- src/gov/nasa/worldwind/geom/PolarPoint.java | 30 +- src/gov/nasa/worldwind/geom/Position.java | 165 +- src/gov/nasa/worldwind/geom/Quaternion.java | 28 +- src/gov/nasa/worldwind/geom/Sector.java | 36 +- src/gov/nasa/worldwind/geom/Sphere.java | 34 +- src/gov/nasa/worldwind/geom/Triangle.java | 30 +- src/gov/nasa/worldwind/geom/Vec4.java | 76 +- .../geom/coords/DatumTransformation.java | 28 +- .../nasa/worldwind/geom/coords/MGRSCoord.java | 36 +- .../geom/coords/MGRSCoordConverter.java | 30 +- .../geom/coords/PolarCoordConverter.java | 28 +- .../nasa/worldwind/geom/coords/TMCoord.java | 28 +- .../geom/coords/TMCoordConverter.java | 28 +- .../nasa/worldwind/geom/coords/UPSCoord.java | 28 +- .../geom/coords/UPSCoordConverter.java | 28 +- .../nasa/worldwind/geom/coords/UTMCoord.java | 28 +- .../geom/coords/UTMCoordConverter.java | 28 +- src/gov/nasa/worldwind/globes/Earth.java | 28 +- src/gov/nasa/worldwind/globes/EarthFlat.java | 28 +- .../nasa/worldwind/globes/ElevationModel.java | 38 +- .../worldwind/globes/EllipsoidalGlobe.java | 32 +- src/gov/nasa/worldwind/globes/FlatGlobe.java | 31 +- .../globes/GeographicProjection.java | 38 +- src/gov/nasa/worldwind/globes/Globe.java | 70 +- src/gov/nasa/worldwind/globes/Globe2D.java | 28 +- .../nasa/worldwind/globes/GlobeStateKey.java | 28 +- .../nasa/worldwind/globes/package-info.java | 39 + src/gov/nasa/worldwind/globes/package.html | 24 - .../AbstractGeographicProjection.java | 28 +- .../ProjectionEquirectangular.java | 28 +- .../projections/ProjectionMercator.java | 28 +- .../ProjectionModifiedSinusoidal.java | 28 +- .../ProjectionPolarEquidistant.java | 28 +- .../projections/ProjectionSinusoidal.java | 28 +- .../ProjectionTransverseMercator.java | 30 +- .../globes/projections/ProjectionUPS.java | 28 +- .../globes/projections/ProjectionUTM.java | 28 +- .../layers/AbstractGraticuleLayer.java | 33 +- .../nasa/worldwind/layers/AbstractLayer.java | 34 +- .../nasa/worldwind/layers/AirspaceLayer.java | 57 +- .../worldwind/layers/AnnotationLayer.java | 30 +- .../worldwind/layers/BasicLayerFactory.java | 38 +- .../layers/BasicTiledImageLayer.java | 52 +- .../BasicTiledImageLayerBulkDownloader.java | 38 +- .../layers/CachedRenderableLayer.java | 32 +- .../nasa/worldwind/layers/CompassLayer.java | 34 +- .../nasa/worldwind/layers/CrosshairLayer.java | 32 +- .../worldwind/layers/Earth/BMNGOneImage.java | 28 +- .../worldwind/layers/Earth/BMNGWMSLayer.java | 28 +- .../layers/Earth/CountryBoundariesLayer.java | 28 +- .../layers/Earth/LandsatI3WMSLayer.java | 28 +- .../layers/Earth/MGRSGraticuleLayer.java | 28 +- .../layers/Earth/MSVirtualEarthLayer.java | 28 +- .../layers/Earth/NASAWFSPlaceNameLayer.java | 28 +- .../layers/Earth/OSMCycleMapLayer.java | 28 +- .../layers/Earth/OSMMapnikLayer.java | 28 +- .../Earth/ScankortDenmarkImageLayer.java | 35 - .../layers/Earth/USDANAIPWMSImageLayer.java | 28 +- .../layers/Earth/USGSDigitalOrtho.java | 28 +- .../layers/Earth/USGSTopoHighRes.java | 28 +- .../layers/Earth/USGSTopoLowRes.java | 28 +- .../layers/Earth/USGSTopoMedRes.java | 28 +- .../layers/Earth/USGSUrbanAreaOrtho.java | 28 +- .../layers/Earth/UTMBaseGraticuleLayer.java | 28 +- .../layers/Earth/UTMGraticuleLayer.java | 28 +- .../worldwind/layers/GARSGraticuleLayer.java | 28 +- .../layers/GraticuleRenderingParams.java | 28 +- .../worldwind/layers/GraticuleSupport.java | 30 +- src/gov/nasa/worldwind/layers/IconLayer.java | 30 +- .../layers/LatLonGraticuleLayer.java | 28 +- src/gov/nasa/worldwind/layers/Layer.java | 38 +- src/gov/nasa/worldwind/layers/LayerList.java | 28 +- .../layers/LocalRasterServerLayer.java | 40 +- .../nasa/worldwind/layers/MarkerLayer.java | 28 +- .../worldwind/layers/RenderableLayer.java | 48 +- .../nasa/worldwind/layers/ScalebarLayer.java | 30 +- .../nasa/worldwind/layers/SkyColorLayer.java | 30 +- .../worldwind/layers/SkyGradientLayer.java | 34 +- .../nasa/worldwind/layers/StarsConvertor.java | 28 +- src/gov/nasa/worldwind/layers/StarsLayer.java | 30 +- .../worldwind/layers/SurfaceImageLayer.java | 44 +- .../worldwind/layers/TerrainProfileLayer.java | 988 +++++---- .../nasa/worldwind/layers/TextureTile.java | 38 +- .../worldwind/layers/TiledImageLayer.java | 52 +- .../worldwind/layers/ViewControlsLayer.java | 32 +- .../layers/ViewControlsSelectListener.java | 40 +- .../nasa/worldwind/layers/WorldMapLayer.java | 36 +- .../BasicMercatorTiledImageLayer.java | 28 +- .../layers/mercator/MercatorSector.java | 28 +- .../layers/mercator/MercatorTextureTile.java | 28 +- .../mercator/MercatorTiledImageLayer.java | 32 +- .../layers/placename/PlaceNameLayer.java | 50 +- .../PlaceNameLayerBulkDownloader.java | 38 +- .../layers/placename/PlaceNameService.java | 28 +- .../layers/placename/PlaceNameServiceSet.java | 28 +- .../worldwind/layers/rpf/RPFFileIndex.java | 28 +- .../worldwind/layers/rpf/RPFGenerator.java | 28 +- .../worldwind/layers/rpf/RPFRetriever.java | 28 +- .../layers/rpf/RPFTiledImageLayer.java | 30 +- .../layers/rpf/RPFTiledImageProcessor.java | 28 +- .../layers/rpf/wizard/DataChooserPanel.java | 28 +- .../wizard/DataChooserPanelDescriptor.java | 28 +- .../layers/rpf/wizard/ETRCalculator.java | 28 +- .../layers/rpf/wizard/FileChooserPanel.java | 28 +- .../wizard/FileChooserPanelDescriptor.java | 28 +- .../rpf/wizard/FileSearchPanelDescriptor.java | 28 +- .../worldwind/layers/rpf/wizard/FileSet.java | 28 +- .../rpf/wizard/PreprocessPanelDescriptor.java | 28 +- .../layers/rpf/wizard/ProgressPanel.java | 28 +- .../layers/rpf/wizard/RPFImportWizard.java | 28 +- .../layers/rpf/wizard/RPFWizardUtil.java | 28 +- .../layers/rpf/wizard/SizeFormatter.java | 28 +- .../layers/rpf/wizard/TimeFormatter.java | 28 +- src/gov/nasa/worldwind/ogc/OGCAddress.java | 28 +- .../nasa/worldwind/ogc/OGCBoundingBox.java | 28 +- .../nasa/worldwind/ogc/OGCCapabilities.java | 28 +- .../ogc/OGCCapabilityInformation.java | 28 +- src/gov/nasa/worldwind/ogc/OGCConstants.java | 28 +- .../worldwind/ogc/OGCContactInformation.java | 28 +- src/gov/nasa/worldwind/ogc/OGCDCType.java | 28 +- .../nasa/worldwind/ogc/OGCOnlineResource.java | 28 +- .../worldwind/ogc/OGCRequestDescription.java | 28 +- .../worldwind/ogc/OGCServiceInformation.java | 28 +- .../ogc/collada/ColladaAbstractGeometry.java | 28 +- .../ogc/collada/ColladaAbstractInstance.java | 28 +- .../ogc/collada/ColladaAbstractObject.java | 28 +- .../ColladaAbstractParamContainer.java | 28 +- .../ogc/collada/ColladaAbstractShader.java | 28 +- .../ogc/collada/ColladaAccessor.java | 28 +- .../worldwind/ogc/collada/ColladaAsset.java | 28 +- .../worldwind/ogc/collada/ColladaBind.java | 28 +- .../ogc/collada/ColladaBindMaterial.java | 28 +- .../ogc/collada/ColladaBindVertexInput.java | 28 +- .../worldwind/ogc/collada/ColladaColor.java | 28 +- .../ogc/collada/ColladaConstants.java | 28 +- .../ogc/collada/ColladaContributor.java | 28 +- .../worldwind/ogc/collada/ColladaEffect.java | 28 +- .../worldwind/ogc/collada/ColladaExtra.java | 28 +- .../ogc/collada/ColladaFloatArray.java | 28 +- .../ogc/collada/ColladaFloatOrParam.java | 28 +- .../worldwind/ogc/collada/ColladaFormat.java | 28 +- .../ogc/collada/ColladaGeometry.java | 28 +- .../worldwind/ogc/collada/ColladaImage.java | 28 +- .../worldwind/ogc/collada/ColladaInput.java | 28 +- .../ogc/collada/ColladaInstanceEffect.java | 28 +- .../ogc/collada/ColladaInstanceGeometry.java | 28 +- .../ogc/collada/ColladaInstanceMaterial.java | 28 +- .../ogc/collada/ColladaInstanceNode.java | 28 +- .../collada/ColladaInstanceVisualScene.java | 28 +- .../worldwind/ogc/collada/ColladaLambert.java | 28 +- .../worldwind/ogc/collada/ColladaLibrary.java | 28 +- .../worldwind/ogc/collada/ColladaLines.java | 28 +- .../ogc/collada/ColladaMaterial.java | 28 +- .../worldwind/ogc/collada/ColladaMatrix.java | 28 +- .../worldwind/ogc/collada/ColladaMesh.java | 28 +- .../ogc/collada/ColladaNewParam.java | 28 +- .../worldwind/ogc/collada/ColladaNode.java | 28 +- .../nasa/worldwind/ogc/collada/ColladaP.java | 28 +- .../worldwind/ogc/collada/ColladaParam.java | 28 +- .../ogc/collada/ColladaParserContext.java | 30 +- .../worldwind/ogc/collada/ColladaPhong.java | 28 +- .../ogc/collada/ColladaProfileCommon.java | 28 +- .../ogc/collada/ColladaResourceResolver.java | 28 +- .../worldwind/ogc/collada/ColladaRoot.java | 40 +- .../ogc/collada/ColladaSampler2D.java | 28 +- .../worldwind/ogc/collada/ColladaScene.java | 28 +- .../worldwind/ogc/collada/ColladaSource.java | 28 +- .../worldwind/ogc/collada/ColladaSurface.java | 28 +- .../ogc/collada/ColladaTechnique.java | 28 +- .../ogc/collada/ColladaTechniqueCommon.java | 28 +- .../worldwind/ogc/collada/ColladaTexture.java | 28 +- .../ogc/collada/ColladaTextureOrColor.java | 28 +- .../ogc/collada/ColladaTriangles.java | 28 +- .../worldwind/ogc/collada/ColladaUnit.java | 28 +- .../ogc/collada/ColladaUnsupported.java | 30 +- .../ogc/collada/ColladaVertices.java | 28 +- .../ogc/collada/ColladaVisualScene.java | 28 +- .../ogc/collada/impl/ColladaController.java | 32 +- .../ogc/collada/impl/ColladaMeshShape.java | 41 +- .../ogc/collada/impl/ColladaRenderable.java | 28 +- .../collada/impl/ColladaTraversalContext.java | 28 +- .../ogc/collada/impl/package-info.java | 35 + .../worldwind/ogc/collada/impl/package.html | 17 - .../worldwind/ogc/collada/io/ColladaDoc.java | 30 +- .../worldwind/ogc/collada/io/ColladaFile.java | 28 +- .../ogc/collada/io/ColladaInputStream.java | 28 +- .../ogc/collada/io/package-info.java | 34 + .../worldwind/ogc/collada/io/package.html | 16 - .../worldwind/ogc/collada/package-info.java | 71 + .../nasa/worldwind/ogc/collada/package.html | 52 - .../nasa/worldwind/ogc/gml/GMLEnvelope.java | 28 +- .../ogc/gml/GMLEnvelopeWithTimePeriod.java | 28 +- src/gov/nasa/worldwind/ogc/gml/GMLGrid.java | 28 +- .../worldwind/ogc/gml/GMLGridEnvelope.java | 28 +- src/gov/nasa/worldwind/ogc/gml/GMLLimits.java | 28 +- src/gov/nasa/worldwind/ogc/gml/GMLOrigin.java | 28 +- src/gov/nasa/worldwind/ogc/gml/GMLPos.java | 28 +- .../worldwind/ogc/gml/GMLRectifiedGrid.java | 28 +- .../ogc/kml/KMLAbstractColorStyle.java | 28 +- .../ogc/kml/KMLAbstractContainer.java | 34 +- .../ogc/kml/KMLAbstractEventParser.java | 28 +- .../worldwind/ogc/kml/KMLAbstractFeature.java | 39 +- .../ogc/kml/KMLAbstractGeometry.java | 28 +- .../ogc/kml/KMLAbstractLatLonBoxType.java | 28 +- .../worldwind/ogc/kml/KMLAbstractObject.java | 28 +- .../worldwind/ogc/kml/KMLAbstractOverlay.java | 28 +- .../ogc/kml/KMLAbstractStyleSelector.java | 32 +- .../ogc/kml/KMLAbstractSubStyle.java | 28 +- .../ogc/kml/KMLAbstractTimePrimitive.java | 28 +- .../worldwind/ogc/kml/KMLAbstractView.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLAlias.java | 28 +- .../worldwind/ogc/kml/KMLBalloonStyle.java | 28 +- .../nasa/worldwind/ogc/kml/KMLBoundary.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLCamera.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLChange.java | 28 +- .../nasa/worldwind/ogc/kml/KMLConstants.java | 28 +- .../ogc/kml/KMLCoordinateTokenizer.java | 34 +- .../ogc/kml/KMLCoordinatesParser.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLCreate.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLData.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLDelete.java | 28 +- .../nasa/worldwind/ogc/kml/KMLDocument.java | 28 +- .../worldwind/ogc/kml/KMLExtendedData.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLFolder.java | 28 +- .../worldwind/ogc/kml/KMLGroundOverlay.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLIcon.java | 28 +- .../nasa/worldwind/ogc/kml/KMLIconStyle.java | 28 +- .../worldwind/ogc/kml/KMLImagePyramid.java | 28 +- .../nasa/worldwind/ogc/kml/KMLItemIcon.java | 28 +- .../nasa/worldwind/ogc/kml/KMLLabelStyle.java | 28 +- .../worldwind/ogc/kml/KMLLatLonAltBox.java | 28 +- .../nasa/worldwind/ogc/kml/KMLLatLonBox.java | 28 +- .../nasa/worldwind/ogc/kml/KMLLineString.java | 28 +- .../nasa/worldwind/ogc/kml/KMLLineStyle.java | 28 +- .../nasa/worldwind/ogc/kml/KMLLinearRing.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLLink.java | 36 +- .../nasa/worldwind/ogc/kml/KMLListStyle.java | 28 +- .../nasa/worldwind/ogc/kml/KMLLocation.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLLod.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLLookAt.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLModel.java | 28 +- .../worldwind/ogc/kml/KMLMultiGeometry.java | 28 +- .../worldwind/ogc/kml/KMLNetworkLink.java | 39 +- .../ogc/kml/KMLNetworkLinkControl.java | 28 +- .../worldwind/ogc/kml/KMLOrientation.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLPair.java | 28 +- .../worldwind/ogc/kml/KMLParserContext.java | 28 +- .../worldwind/ogc/kml/KMLPhotoOverlay.java | 28 +- .../nasa/worldwind/ogc/kml/KMLPlacemark.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLPoint.java | 28 +- .../nasa/worldwind/ogc/kml/KMLPolyStyle.java | 28 +- .../nasa/worldwind/ogc/kml/KMLPolygon.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLRegion.java | 78 +- .../worldwind/ogc/kml/KMLResourceMap.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLRoot.java | 74 +- src/gov/nasa/worldwind/ogc/kml/KMLScale.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLSchema.java | 28 +- .../nasa/worldwind/ogc/kml/KMLSchemaData.java | 28 +- .../worldwind/ogc/kml/KMLScreenOverlay.java | 28 +- .../nasa/worldwind/ogc/kml/KMLSimpleData.java | 28 +- .../worldwind/ogc/kml/KMLSimpleField.java | 28 +- .../nasa/worldwind/ogc/kml/KMLSnippet.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLStyle.java | 28 +- .../nasa/worldwind/ogc/kml/KMLStyleMap.java | 30 +- .../nasa/worldwind/ogc/kml/KMLStyleUrl.java | 30 +- .../nasa/worldwind/ogc/kml/KMLTimeSpan.java | 28 +- .../nasa/worldwind/ogc/kml/KMLTimeStamp.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLUpdate.java | 28 +- .../worldwind/ogc/kml/KMLUpdateOperation.java | 28 +- src/gov/nasa/worldwind/ogc/kml/KMLVec2.java | 28 +- .../nasa/worldwind/ogc/kml/KMLViewVolume.java | 28 +- .../ogc/kml/gx/GXAbstractTourPrimitive.java | 28 +- .../ogc/kml/gx/GXAnimatedUpdate.java | 28 +- .../worldwind/ogc/kml/gx/GXConstants.java | 28 +- .../nasa/worldwind/ogc/kml/gx/GXFlyTo.java | 28 +- .../worldwind/ogc/kml/gx/GXLatLongQuad.java | 28 +- .../worldwind/ogc/kml/gx/GXParserContext.java | 28 +- .../nasa/worldwind/ogc/kml/gx/GXPlaylist.java | 28 +- .../nasa/worldwind/ogc/kml/gx/GXSoundCue.java | 28 +- src/gov/nasa/worldwind/ogc/kml/gx/GXTour.java | 28 +- .../worldwind/ogc/kml/gx/GXTourControl.java | 28 +- src/gov/nasa/worldwind/ogc/kml/gx/GXWait.java | 28 +- .../worldwind/ogc/kml/gx/package-info.java | 34 + .../nasa/worldwind/ogc/kml/gx/package.html | 25 - .../ogc/kml/impl/KMLAbstractBalloon.java | 42 +- .../ogc/kml/impl/KMLBalloonTextDecoder.java | 28 +- .../worldwind/ogc/kml/impl/KMLController.java | 30 +- .../worldwind/ogc/kml/impl/KMLExportUtil.java | 30 +- .../ogc/kml/impl/KMLExtrudedPolygonImpl.java | 28 +- .../ogc/kml/impl/KMLGlobeBalloonImpl.java | 28 +- .../kml/impl/KMLGroundOverlayPolygonImpl.java | 28 +- .../kml/impl/KMLLineStringPlacemarkImpl.java | 28 +- .../ogc/kml/impl/KMLModelPlacemarkImpl.java | 37 +- .../ogc/kml/impl/KMLPointPlacemarkImpl.java | 28 +- .../ogc/kml/impl/KMLPolygonImpl.java | 28 +- .../worldwind/ogc/kml/impl/KMLRenderable.java | 28 +- .../ogc/kml/impl/KMLScreenBalloonImpl.java | 28 +- .../ogc/kml/impl/KMLScreenImageImpl.java | 33 +- .../ogc/kml/impl/KMLSurfaceImageImpl.java | 28 +- .../ogc/kml/impl/KMLSurfacePolygonImpl.java | 30 +- .../ogc/kml/impl/KMLTraversalContext.java | 28 +- .../nasa/worldwind/ogc/kml/impl/KMLUtil.java | 30 +- src/gov/nasa/worldwind/ogc/kml/io/KMLDoc.java | 30 +- .../nasa/worldwind/ogc/kml/io/KMLFile.java | 30 +- .../worldwind/ogc/kml/io/KMLInputStream.java | 28 +- .../nasa/worldwind/ogc/kml/io/KMZFile.java | 34 +- .../worldwind/ogc/kml/io/KMZInputStream.java | 34 +- .../worldwind/ogc/kml/io/package-info.java | 34 + .../nasa/worldwind/ogc/kml/io/package.html | 16 - .../nasa/worldwind/ogc/kml/package-info.java | 78 + src/gov/nasa/worldwind/ogc/kml/package.html | 60 - .../nasa/worldwind/ogc/ows/OWSAddress.java | 28 +- .../worldwind/ogc/ows/OWSAllowedValues.java | 28 +- .../worldwind/ogc/ows/OWSCapabilities.java | 28 +- .../nasa/worldwind/ogc/ows/OWSConstraint.java | 28 +- .../worldwind/ogc/ows/OWSContactInfo.java | 28 +- src/gov/nasa/worldwind/ogc/ows/OWSDCP.java | 28 +- src/gov/nasa/worldwind/ogc/ows/OWSHTTP.java | 28 +- .../nasa/worldwind/ogc/ows/OWSOperation.java | 28 +- .../ogc/ows/OWSOperationsMetadata.java | 28 +- .../nasa/worldwind/ogc/ows/OWSParameter.java | 28 +- src/gov/nasa/worldwind/ogc/ows/OWSPhone.java | 28 +- .../worldwind/ogc/ows/OWSServiceContact.java | 28 +- .../ogc/ows/OWSServiceIdentification.java | 28 +- .../worldwind/ogc/ows/OWSServiceProvider.java | 28 +- .../ogc/ows/OWSWGS84BoundingBox.java | 28 +- .../worldwind/ogc/wcs/WCSCapabilities.java | 28 +- .../nasa/worldwind/ogc/wcs/WCSContents.java | 28 +- .../worldwind/ogc/wcs/WCSCoverageSummary.java | 28 +- .../ogc/wcs/wcs100/WCS100AxisDescription.java | 28 +- .../wcs100/WCS100AxisDescriptionHolder.java | 28 +- .../ogc/wcs/wcs100/WCS100Capabilities.java | 29 +- .../ogc/wcs/wcs100/WCS100Capability.java | 28 +- .../ogc/wcs/wcs100/WCS100ContentMetadata.java | 28 +- .../wcs/wcs100/WCS100CoverageOffering.java | 28 +- .../wcs100/WCS100CoverageOfferingBrief.java | 28 +- .../ogc/wcs/wcs100/WCS100DCPType.java | 28 +- .../wcs/wcs100/WCS100DescribeCoverage.java | 28 +- .../ogc/wcs/wcs100/WCS100DomainSet.java | 28 +- .../ogc/wcs/wcs100/WCS100Exception.java | 28 +- .../worldwind/ogc/wcs/wcs100/WCS100HTTP.java | 28 +- .../ogc/wcs/wcs100/WCS100Interval.java | 28 +- .../ogc/wcs/wcs100/WCS100LonLatEnvelope.java | 28 +- .../worldwind/ogc/wcs/wcs100/WCS100Max.java | 28 +- .../ogc/wcs/wcs100/WCS100MetadataLink.java | 28 +- .../worldwind/ogc/wcs/wcs100/WCS100Min.java | 28 +- .../ogc/wcs/wcs100/WCS100RangeSet.java | 28 +- .../ogc/wcs/wcs100/WCS100RangeSetHolder.java | 28 +- .../ogc/wcs/wcs100/WCS100Request.java | 28 +- .../wcs/wcs100/WCS100RequestDescription.java | 28 +- .../wcs/wcs100/WCS100ResponsibleParty.java | 28 +- .../ogc/wcs/wcs100/WCS100Service.java | 28 +- .../ogc/wcs/wcs100/WCS100SingleValue.java | 28 +- .../ogc/wcs/wcs100/WCS100SpatialDomain.java | 28 +- .../ogc/wcs/wcs100/WCS100SupportedCRSs.java | 28 +- .../wcs/wcs100/WCS100SupportedFormats.java | 28 +- .../wcs100/WCS100SupportedInterpolations.java | 28 +- .../ogc/wcs/wcs100/WCS100Values.java | 28 +- .../worldwind/ogc/wms/WMSAuthorityURL.java | 28 +- .../worldwind/ogc/wms/WMSCapabilities.java | 29 +- .../ogc/wms/WMSCapabilityInformation.java | 28 +- .../ogc/wms/WMSLayerAttribution.java | 28 +- .../ogc/wms/WMSLayerCapabilities.java | 28 +- .../worldwind/ogc/wms/WMSLayerDimension.java | 28 +- .../worldwind/ogc/wms/WMSLayerExtent.java | 28 +- .../worldwind/ogc/wms/WMSLayerIdentifier.java | 28 +- .../worldwind/ogc/wms/WMSLayerInfoURL.java | 28 +- .../nasa/worldwind/ogc/wms/WMSLayerStyle.java | 28 +- .../nasa/worldwind/ogc/wms/WMSLogoURL.java | 28 +- .../ogc/wms/WMSServiceInformation.java | 28 +- src/gov/nasa/worldwind/pick/PickSupport.java | 34 +- src/gov/nasa/worldwind/pick/PickedObject.java | 28 +- .../worldwind/pick/PickedObjectFactory.java | 30 +- .../nasa/worldwind/pick/PickedObjectList.java | 28 +- .../worldwind/poi/BasicPointOfInterest.java | 28 +- src/gov/nasa/worldwind/poi/Gazetteer.java | 28 +- src/gov/nasa/worldwind/poi/POIUtils.java | 30 +- .../nasa/worldwind/poi/PointOfInterest.java | 28 +- .../nasa/worldwind/poi/YahooGazetteer.java | 28 +- .../worldwind/render/AbstractAnnotation.java | 67 +- .../render/AbstractAnnotationBalloon.java | 30 +- .../render/AbstractAnnotationLayout.java | 30 +- .../worldwind/render/AbstractBalloon.java | 28 +- .../render/AbstractBrowserBalloon.java | 100 +- .../render/AbstractGeneralShape.java | 36 +- .../nasa/worldwind/render/AbstractShape.java | 78 +- .../render/AbstractSurfaceObject.java | 47 +- .../render/AbstractSurfaceRenderable.java | 30 +- .../render/AbstractSurfaceShape.java | 49 +- src/gov/nasa/worldwind/render/Annotation.java | 32 +- .../render/AnnotationAttributes.java | 30 +- .../render/AnnotationFlowLayout.java | 30 +- .../render/AnnotationLayoutManager.java | 28 +- .../render/AnnotationNullLayout.java | 30 +- .../worldwind/render/AnnotationRenderer.java | 28 +- .../nasa/worldwind/render/Attributable.java | 28 +- src/gov/nasa/worldwind/render/Balloon.java | 30 +- .../worldwind/render/BalloonAttributes.java | 58 +- .../render/BasicAnnotationRenderer.java | 30 +- .../render/BasicBalloonAttributes.java | 42 +- .../worldwind/render/BasicLightingModel.java | 30 +- .../render/BasicShapeAttributes.java | 33 +- .../nasa/worldwind/render/BasicWWTexture.java | 38 +- src/gov/nasa/worldwind/render/Box.java | 30 +- src/gov/nasa/worldwind/render/Cone.java | 30 +- .../nasa/worldwind/render/ContourLine.java | 264 ++- .../worldwind/render/ContourLinePolygon.java | 28 +- src/gov/nasa/worldwind/render/Cylinder.java | 30 +- .../nasa/worldwind/render/Declutterable.java | 28 +- .../worldwind/render/DeclutterableText.java | 28 +- .../render/DeclutteringTextRenderer.java | 34 +- .../nasa/worldwind/render/DrawContext.java | 78 +- .../worldwind/render/DrawContextImpl.java | 40 +- src/gov/nasa/worldwind/render/Ellipsoid.java | 34 +- .../worldwind/render/ExtrudedPolygon.java | 56 +- src/gov/nasa/worldwind/render/FBOTexture.java | 30 +- .../nasa/worldwind/render/FrameFactory.java | 30 +- .../worldwind/render/FramebufferTexture.java | 30 +- .../render/GLRuntimeCapabilities.java | 46 +- .../worldwind/render/GeographicExtent.java | 28 +- .../render/GeographicSurfaceTileRenderer.java | 28 +- .../nasa/worldwind/render/GeographicText.java | 28 +- .../render/GeographicTextRenderer.java | 34 +- .../worldwind/render/GlobeAnnotation.java | 38 +- .../render/GlobeAnnotationBalloon.java | 28 +- .../nasa/worldwind/render/GlobeBalloon.java | 28 +- .../worldwind/render/GlobeBrowserBalloon.java | 39 +- .../nasa/worldwind/render/Highlightable.java | 28 +- .../nasa/worldwind/render/IconRenderer.java | 34 +- .../worldwind/render/LazilyLoadedTexture.java | 44 +- .../nasa/worldwind/render/LightingModel.java | 28 +- src/gov/nasa/worldwind/render/Material.java | 30 +- .../render/MultiLineTextRenderer.java | 66 +- .../worldwind/render/MultiResolutionPath.java | 47 +- src/gov/nasa/worldwind/render/Offset.java | 32 +- .../nasa/worldwind/render/OffsetsList.java | 28 +- .../worldwind/render/OrderedRenderable.java | 28 +- .../nasa/worldwind/render/OutlinedShape.java | 32 +- src/gov/nasa/worldwind/render/Path.java | 1405 ++++++------- .../nasa/worldwind/render/PatternFactory.java | 28 +- src/gov/nasa/worldwind/render/Pedestal.java | 28 +- .../nasa/worldwind/render/PointPlacemark.java | 63 +- .../render/PointPlacemarkAttributes.java | 43 +- src/gov/nasa/worldwind/render/Polygon.java | 52 +- .../worldwind/render/PolygonTessellator.java | 30 +- src/gov/nasa/worldwind/render/Polyline.java | 35 +- .../worldwind/render/PolylineTessellator.java | 28 +- .../nasa/worldwind/render/PreRenderable.java | 28 +- src/gov/nasa/worldwind/render/Pyramid.java | 30 +- .../nasa/worldwind/render/Quadrilateral.java | 30 +- src/gov/nasa/worldwind/render/Renderable.java | 28 +- src/gov/nasa/worldwind/render/RigidShape.java | 38 +- .../worldwind/render/ScreenAnnotation.java | 30 +- .../render/ScreenAnnotationBalloon.java | 28 +- .../nasa/worldwind/render/ScreenBalloon.java | 28 +- .../render/ScreenBrowserBalloon.java | 35 +- .../nasa/worldwind/render/ScreenCredit.java | 28 +- .../render/ScreenCreditController.java | 28 +- .../worldwind/render/ScreenCreditImage.java | 28 +- .../nasa/worldwind/render/ScreenImage.java | 37 +- .../render/ScreenRelativeAnnotation.java | 30 +- .../worldwind/render/ShapeAttributes.java | 34 +- src/gov/nasa/worldwind/render/Size.java | 37 +- .../nasa/worldwind/render/SurfaceCircle.java | 28 +- .../nasa/worldwind/render/SurfaceEllipse.java | 30 +- .../nasa/worldwind/render/SurfaceIcon.java | 76 +- .../nasa/worldwind/render/SurfaceIcons.java | 32 +- .../nasa/worldwind/render/SurfaceImage.java | 33 +- .../worldwind/render/SurfaceMultiPolygon.java | 28 +- .../nasa/worldwind/render/SurfaceObject.java | 32 +- .../render/SurfaceObjectTileBuilder.java | 87 +- .../nasa/worldwind/render/SurfacePolygon.java | 36 +- .../worldwind/render/SurfacePolygons.java | 46 +- .../worldwind/render/SurfacePolyline.java | 32 +- .../worldwind/render/SurfacePolylines.java | 30 +- .../nasa/worldwind/render/SurfaceQuad.java | 30 +- .../worldwind/render/SurfaceRenderable.java | 32 +- .../nasa/worldwind/render/SurfaceSector.java | 28 +- .../nasa/worldwind/render/SurfaceShape.java | 30 +- .../nasa/worldwind/render/SurfaceSquare.java | 28 +- .../nasa/worldwind/render/SurfaceText.java | 46 +- .../nasa/worldwind/render/SurfaceTile.java | 28 +- .../worldwind/render/SurfaceTileRenderer.java | 32 +- .../nasa/worldwind/render/TextRenderer.java | 267 ++- .../worldwind/render/TextRendererCache.java | 28 +- .../worldwind/render/ToolTipRenderer.java | 30 +- .../nasa/worldwind/render/TrackRenderer.java | 34 +- .../nasa/worldwind/render/UserFacingIcon.java | 28 +- .../nasa/worldwind/render/UserFacingText.java | 28 +- src/gov/nasa/worldwind/render/WWIcon.java | 32 +- src/gov/nasa/worldwind/render/WWTexture.java | 34 +- src/gov/nasa/worldwind/render/Wedge.java | 30 +- .../render/airspaces/AbstractAirspace.java | 32 +- .../worldwind/render/airspaces/Airspace.java | 42 +- .../render/airspaces/AirspaceAttributes.java | 42 +- .../airspaces/BasicAirspaceAttributes.java | 53 +- .../nasa/worldwind/render/airspaces/Box.java | 37 +- .../nasa/worldwind/render/airspaces/Cake.java | 28 +- .../render/airspaces/CappedCylinder.java | 30 +- .../airspaces/CappedEllipticalCylinder.java | 30 +- .../worldwind/render/airspaces/Curtain.java | 30 +- .../render/airspaces/DetailLevel.java | 28 +- .../worldwind/render/airspaces/Geometry.java | 30 +- .../worldwind/render/airspaces/Orbit.java | 30 +- .../airspaces/PartialCappedCylinder.java | 30 +- .../worldwind/render/airspaces/PolyArc.java | 28 +- .../worldwind/render/airspaces/Polygon.java | 30 +- .../worldwind/render/airspaces/Route.java | 28 +- .../airspaces/ScreenSizeDetailLevel.java | 28 +- .../render/airspaces/SphereAirspace.java | 30 +- .../render/airspaces/SurfaceBox.java | 30 +- .../render/airspaces/TrackAirspace.java | 32 +- .../editor/AbstractAirspaceEditor.java | 28 +- .../editor/AirspaceControlPoint.java | 28 +- .../editor/AirspaceControlPointRenderer.java | 28 +- .../airspaces/editor/AirspaceEditEvent.java | 28 +- .../editor/AirspaceEditListener.java | 28 +- .../airspaces/editor/AirspaceEditor.java | 28 +- .../editor/AirspaceEditorController.java | 28 +- .../airspaces/editor/AirspaceEditorUtil.java | 28 +- .../editor/BasicAirspaceControlPoint.java | 28 +- .../BasicAirspaceControlPointRenderer.java | 30 +- .../airspaces/editor/PolygonEditor.java | 28 +- .../editor/SphereAirspaceEditor.java | 28 +- .../worldwind/render/markers/BasicMarker.java | 28 +- .../render/markers/BasicMarkerAttributes.java | 30 +- .../render/markers/BasicMarkerShape.java | 34 +- .../nasa/worldwind/render/markers/Marker.java | 28 +- .../render/markers/MarkerAttributes.java | 28 +- .../render/markers/MarkerRenderer.java | 30 +- .../worldwind/render/markers/MarkerShape.java | 28 +- .../AbstractRetrievalPostProcessor.java | 34 +- .../retrieve/BasicRetrievalService.java | 28 +- .../worldwind/retrieve/BulkRetrievable.java | 38 +- .../retrieve/BulkRetrievalThread.java | 32 +- .../worldwind/retrieve/HTTPRetriever.java | 28 +- .../nasa/worldwind/retrieve/JarRetriever.java | 30 +- .../retrieve/LocalRasterServerRetriever.java | 28 +- src/gov/nasa/worldwind/retrieve/Progress.java | 28 +- .../worldwind/retrieve/RetrievalFuture.java | 28 +- .../retrieve/RetrievalPostProcessor.java | 28 +- .../worldwind/retrieve/RetrievalService.java | 28 +- .../nasa/worldwind/retrieve/Retriever.java | 28 +- .../worldwind/retrieve/RetrieverFactory.java | 28 +- .../nasa/worldwind/retrieve/URLRetriever.java | 32 +- .../symbology/AbstractIconRetriever.java | 42 +- .../symbology/AbstractTacticalGraphic.java | 34 +- .../symbology/AbstractTacticalSymbol.java | 33 +- .../BasicTacticalGraphicAttributes.java | 28 +- .../BasicTacticalSymbolAttributes.java | 28 +- .../worldwind/symbology/IconRetriever.java | 30 +- .../symbology/SymbologyConstants.java | 118 +- .../worldwind/symbology/TacticalCircle.java | 28 +- .../worldwind/symbology/TacticalGraphic.java | 80 +- .../symbology/TacticalGraphicAttributes.java | 35 +- .../symbology/TacticalGraphicFactory.java | 31 +- .../symbology/TacticalGraphicLabel.java | 47 +- .../symbology/TacticalGraphicUtil.java | 38 +- .../worldwind/symbology/TacticalPoint.java | 28 +- .../worldwind/symbology/TacticalQuad.java | 28 +- .../worldwind/symbology/TacticalRoute.java | 28 +- .../worldwind/symbology/TacticalSymbol.java | 61 +- .../symbology/TacticalSymbolAttributes.java | 28 +- .../milstd1477/MilStd1477IconRetriever.java | 28 +- .../AbstractMilStd2525TacticalGraphic.java | 28 +- .../milstd2525/MilStd2525Constants.java | 28 +- .../milstd2525/MilStd2525GraphicFactory.java | 28 +- .../milstd2525/MilStd2525IconRetriever.java | 40 +- .../MilStd2525ModifierRetriever.java | 28 +- .../milstd2525/MilStd2525PointGraphic.java | 30 +- .../MilStd2525PointGraphicRetriever.java | 34 +- .../milstd2525/MilStd2525TacticalGraphic.java | 49 +- .../milstd2525/MilStd2525TacticalSymbol.java | 65 +- .../milstd2525/MilStd2525UnitsFormat.java | 32 +- .../symbology/milstd2525/MilStd2525Util.java | 28 +- .../symbology/milstd2525/SymbolCode.java | 102 +- .../graphics/DefaultLabelLayouts.java | 28 +- .../milstd2525/graphics/DefaultOffsets.java | 30 +- .../milstd2525/graphics/EchelonSymbol.java | 30 +- .../milstd2525/graphics/EmsSidc.java | 30 +- .../milstd2525/graphics/MetocSidc.java | 30 +- .../milstd2525/graphics/TacGrpSidc.java | 28 +- .../graphics/TacticalGraphicSymbol.java | 39 +- .../TriangleWavePositionIterator.java | 35 +- .../areas/AbstractCircularGraphic.java | 28 +- .../areas/AbstractRectangularGraphic.java | 28 +- .../graphics/areas/AirfieldZone.java | 31 +- .../milstd2525/graphics/areas/Airhead.java | 28 +- .../milstd2525/graphics/areas/Ambush.java | 31 +- .../graphics/areas/AttackByFirePosition.java | 31 +- .../graphics/areas/AviationZone.java | 29 +- .../milstd2525/graphics/areas/BasicArea.java | 31 +- .../graphics/areas/BattlePosition.java | 31 +- .../areas/CircularFireSupportArea.java | 29 +- .../graphics/areas/CircularPositionArea.java | 28 +- .../graphics/areas/CircularRangeFan.java | 28 +- .../graphics/areas/CombatSupportArea.java | 29 +- .../milstd2525/graphics/areas/Dummy.java | 33 +- .../graphics/areas/Encirclement.java | 29 +- .../milstd2525/graphics/areas/FilledArea.java | 28 +- .../areas/FireSupportTextBuilder.java | 28 +- .../graphics/areas/FortifiedArea.java | 29 +- .../graphics/areas/GroupOfTargets.java | 28 +- .../areas/IrregularFireSupportArea.java | 29 +- .../graphics/areas/LimitedAccessArea.java | 30 +- .../graphics/areas/LimitedAccessSymbol.java | 28 +- .../areas/MinimumSafeDistanceZones.java | 28 +- .../graphics/areas/OffenseArea.java | 29 +- .../areas/RectangularFireSupportArea.java | 29 +- .../areas/RectangularPositionArea.java | 28 +- .../graphics/areas/RectangularTarget.java | 28 +- .../milstd2525/graphics/areas/SearchArea.java | 31 +- .../graphics/areas/SectorRangeFan.java | 33 +- .../milstd2525/graphics/areas/Smoke.java | 28 +- .../graphics/areas/SpecialInterestArea.java | 29 +- .../graphics/areas/SupportByFirePosition.java | 28 +- .../graphics/areas/WeaponsFreeZone.java | 28 +- .../graphics/areas/package-info.java | 36 + .../milstd2525/graphics/areas/package.html | 21 - .../graphics/lines/AbstractAxisArrow.java | 34 +- .../graphics/lines/AdvanceForFeint.java | 28 +- .../milstd2525/graphics/lines/Airborne.java | 28 +- .../graphics/lines/AttackRotaryWing.java | 28 +- .../milstd2525/graphics/lines/Aviation.java | 28 +- .../milstd2525/graphics/lines/Boundary.java | 28 +- .../graphics/lines/DirectionOfAttack.java | 32 +- .../lines/DirectionOfAttackAviation.java | 32 +- .../lines/DirectionOfAttackForFeint.java | 28 +- .../graphics/lines/DoseRateContourLine.java | 28 +- .../graphics/lines/FireSupportLine.java | 32 +- .../lines/ForwardEdgeOfBattleArea.java | 28 +- .../lines/ForwardLineOfOwnTroops.java | 29 +- .../graphics/lines/HoldingLine.java | 34 +- .../graphics/lines/InfiltrationLane.java | 31 +- .../graphics/lines/LineOfContact.java | 28 +- .../graphics/lines/LinearTarget.java | 32 +- .../milstd2525/graphics/lines/MainAttack.java | 28 +- .../graphics/lines/MunitionFlightPath.java | 28 +- .../milstd2525/graphics/lines/PhaseLine.java | 32 +- .../lines/PrincipleDirectionOfFire.java | 31 +- .../graphics/lines/PullUpPoint.java | 31 +- .../milstd2525/graphics/lines/Route.java | 31 +- .../milstd2525/graphics/lines/RoutePoint.java | 29 +- .../graphics/lines/SupportingAttack.java | 28 +- .../graphics/lines/package-info.java | 36 + .../milstd2525/graphics/lines/package.html | 21 - .../symbology/milstd2525/package-info.java | 40 + .../symbology/milstd2525/package.html | 23 - .../worldwind/symbology/package-info.java | 36 + src/gov/nasa/worldwind/symbology/package.html | 21 - .../terrain/AbstractElevationModel.java | 36 +- .../terrain/BasicElevationModel.java | 59 +- .../BasicElevationModelBulkDownloader.java | 38 +- .../terrain/BasicElevationModelFactory.java | 38 +- .../BathymetryFilterElevationModel.java | 28 +- .../terrain/CompoundElevationModel.java | 32 +- .../terrain/HighResolutionTerrain.java | 41 +- .../terrain/LocalElevationModel.java | 30 +- .../LocalRasterServerElevationModel.java | 40 +- .../terrain/RectangularTessellator.java | 32 +- .../worldwind/terrain/SectorGeometry.java | 44 +- .../worldwind/terrain/SectorGeometryList.java | 40 +- src/gov/nasa/worldwind/terrain/Terrain.java | 38 +- .../nasa/worldwind/terrain/Tessellator.java | 28 +- .../worldwind/terrain/WCSElevationModel.java | 30 +- .../terrain/WMSBasicElevationModel.java | 33 +- .../worldwind/terrain/ZeroElevationModel.java | 28 +- src/gov/nasa/worldwind/tracks/Track.java | 28 +- src/gov/nasa/worldwind/tracks/TrackPoint.java | 28 +- .../nasa/worldwind/tracks/TrackPointImpl.java | 28 +- .../worldwind/tracks/TrackPointIterator.java | 28 +- .../tracks/TrackPointIteratorImpl.java | 28 +- .../nasa/worldwind/tracks/TrackSegment.java | 28 +- .../worldwind/util/AbsentResourceList.java | 28 +- .../nasa/worldwind/util/AbstractHotSpot.java | 46 +- .../worldwind/util/AbstractResizeHotSpot.java | 32 +- .../worldwind/util/BasicClutterFilter.java | 28 +- src/gov/nasa/worldwind/util/BasicDragger.java | 35 +- .../util/BasicGLCapabilitiesChooser.java | 36 +- .../worldwind/util/BasicNamespaceContext.java | 118 +- .../worldwind/util/BasicNetworkStatus.java | 30 +- .../nasa/worldwind/util/BasicQuadTree.java | 42 +- .../util/BasicScheduledTaskService.java | 28 +- .../nasa/worldwind/util/BasicTextDecoder.java | 28 +- .../worldwind/util/BitSetQuadTreeFilter.java | 32 +- .../nasa/worldwind/util/BoundedHashMap.java | 30 +- .../nasa/worldwind/util/BrowserOpener.java | 28 +- .../nasa/worldwind/util/BufferFactory.java | 30 +- .../nasa/worldwind/util/BufferWrapper.java | 30 +- .../worldwind/util/ClippingTessellator.java | 36 +- .../nasa/worldwind/util/ClutterFilter.java | 28 +- .../worldwind/util/CompoundStringBuilder.java | 28 +- .../worldwind/util/CompoundVecBuffer.java | 34 +- .../nasa/worldwind/util/ContourBuilder.java | 39 +- src/gov/nasa/worldwind/util/ContourList.java | 30 +- .../util/DataConfigurationFilter.java | 30 +- .../util/DataConfigurationUtils.java | 76 +- src/gov/nasa/worldwind/util/DecisionTree.java | 36 +- src/gov/nasa/worldwind/util/EGM96.java | 33 +- .../nasa/worldwind/util/EditorAnnotation.java | 28 +- .../nasa/worldwind/util/ElevationsUtil.java | 28 +- src/gov/nasa/worldwind/util/EntityMap.java | 28 +- src/gov/nasa/worldwind/util/FileTree.java | 28 +- .../worldwind/util/GLUTessellatorSupport.java | 60 +- .../util/GeographicImageInterpolator.java | 28 +- .../nasa/worldwind/util/GeometryBuilder.java | 56 +- .../nasa/worldwind/util/HTTPFileUpload.java | 313 ++- src/gov/nasa/worldwind/util/HotSpot.java | 46 +- .../worldwind/util/ImageInterpolator.java | 28 +- src/gov/nasa/worldwind/util/ImageTiler.java | 28 +- src/gov/nasa/worldwind/util/ImageTrimmer.java | 28 +- src/gov/nasa/worldwind/util/ImageUtil.java | 32 +- src/gov/nasa/worldwind/util/IntSet.java | 30 +- .../nasa/worldwind/util/JOGLVersionInfo.java | 86 +- src/gov/nasa/worldwind/util/Level.java | 28 +- src/gov/nasa/worldwind/util/LevelSet.java | 28 +- src/gov/nasa/worldwind/util/Logging.java | 47 +- .../worldwind/util/MessageStrings.properties | 45 +- .../util/MessageStrings_de_DE.properties | 28 +- .../util/MessageStrings_fr.properties | 28 +- .../util/MessageStrings_ja.properties | 28 +- .../util/MessageStrings_zh_CN.properties | 28 +- .../worldwind/util/NativeLibraryLoader.java | 89 +- .../worldwind/util/NetworkCheckThread.java | 28 +- .../nasa/worldwind/util/NetworkStatus.java | 46 +- .../util/OGLRenderToTextureSupport.java | 54 +- .../nasa/worldwind/util/OGLStackHandler.java | 30 +- .../nasa/worldwind/util/OGLTextRenderer.java | 47 +- src/gov/nasa/worldwind/util/OGLUtil.java | 55 +- .../worldwind/util/PerformanceStatistic.java | 36 +- .../worldwind/util/PickPointFrustumList.java | 28 +- .../util/PlacemarkClutterFilter.java | 30 +- .../worldwind/util/PolygonTessellator2.java | 37 +- .../worldwind/util/PolylineGeneralizer.java | 28 +- .../nasa/worldwind/util/PropertyAccessor.java | 28 +- src/gov/nasa/worldwind/util/Range.java | 28 +- .../util/RasterControlPointList.java | 28 +- .../worldwind/util/RayCastingSupport.java | 28 +- .../worldwind/util/RestorableSupport.java | 44 +- .../worldwind/util/ScheduledTaskService.java | 28 +- .../worldwind/util/SectorVisibilityTree.java | 34 +- .../SessionCacheRetrievalPostProcessor.java | 28 +- .../worldwind/util/SessionCacheUtils.java | 28 +- src/gov/nasa/worldwind/util/ShapeEditor.java | 41 +- .../nasa/worldwind/util/StatisticsPanel.java | 28 +- src/gov/nasa/worldwind/util/StatusBar.java | 28 +- .../nasa/worldwind/util/StatusBarMGRS.java | 28 +- src/gov/nasa/worldwind/util/StatusBarUTM.java | 28 +- .../util/SurfaceTileDrawContext.java | 28 +- src/gov/nasa/worldwind/util/TaskService.java | 28 +- src/gov/nasa/worldwind/util/TextDecoder.java | 30 +- src/gov/nasa/worldwind/util/TextureAtlas.java | 52 +- .../worldwind/util/TextureAtlasElement.java | 32 +- .../worldwind/util/ThreadedTaskService.java | 28 +- src/gov/nasa/worldwind/util/Tile.java | 30 +- src/gov/nasa/worldwind/util/TileKey.java | 45 +- .../nasa/worldwind/util/TileUrlBuilder.java | 28 +- .../worldwind/util/TimedExpirySupport.java | 28 +- src/gov/nasa/worldwind/util/UnitsFormat.java | 84 +- src/gov/nasa/worldwind/util/VecBuffer.java | 30 +- .../nasa/worldwind/util/VecBufferBlocks.java | 28 +- .../worldwind/util/VecBufferSequence.java | 30 +- src/gov/nasa/worldwind/util/WWBufferUtil.java | 28 +- src/gov/nasa/worldwind/util/WWIO.java | 45 +- src/gov/nasa/worldwind/util/WWMath.java | 75 +- src/gov/nasa/worldwind/util/WWUtil.java | 36 +- src/gov/nasa/worldwind/util/WWXML.java | 36 +- .../worldwind/util/combine/Combinable.java | 33 +- .../util/combine/CombineContext.java | 34 +- .../worldwind/util/combine/ShapeCombiner.java | 30 +- .../util/dashboard/DashboardController.java | 91 +- .../util/dashboard/DashboardDialog.java | 28 +- .../util/gdal/GDALAbstractFileFilter.java | 69 +- .../worldwind/util/gdal/GDALDataFinder.java | 28 +- .../util/gdal/GDALLibraryFinder.java | 28 +- .../nasa/worldwind/util/gdal/GDALUtils.java | 1297 +++++------- .../util/layertree/KMLContainerTreeNode.java | 28 +- .../util/layertree/KMLFeatureTreeNode.java | 34 +- .../util/layertree/KMLLayerTreeNode.java | 36 +- .../layertree/KMLNetworkLinkTreeNode.java | 34 +- .../worldwind/util/layertree/LayerTree.java | 28 +- .../util/layertree/LayerTreeModel.java | 33 +- .../util/layertree/LayerTreeNode.java | 30 +- .../util/layertree/package-info.java | 40 + .../worldwind/util/layertree/package.html | 25 - .../worldwind/util/measure/AreaMeasurer.java | 214 +- .../util/measure/LengthMeasurer.java | 410 ++-- .../worldwind/util/measure/MeasureTool.java | 1578 +++++++-------- .../util/measure/MeasureToolController.java | 28 +- .../nasa/worldwind/util/tree/Animation.java | 28 +- .../util/tree/BasicFrameAttributes.java | 28 +- .../nasa/worldwind/util/tree/BasicTree.java | 28 +- .../util/tree/BasicTreeAttributes.java | 28 +- .../worldwind/util/tree/BasicTreeLayout.java | 33 +- .../worldwind/util/tree/BasicTreeModel.java | 28 +- .../worldwind/util/tree/BasicTreeNode.java | 28 +- .../nasa/worldwind/util/tree/DragControl.java | 28 +- .../worldwind/util/tree/FrameAttributes.java | 28 +- .../util/tree/FrameResizeControl.java | 28 +- .../nasa/worldwind/util/tree/ScrollBar.java | 33 +- .../nasa/worldwind/util/tree/ScrollFrame.java | 37 +- .../nasa/worldwind/util/tree/Scrollable.java | 28 +- src/gov/nasa/worldwind/util/tree/Tree.java | 30 +- .../worldwind/util/tree/TreeAttributes.java | 28 +- .../nasa/worldwind/util/tree/TreeHotSpot.java | 28 +- .../nasa/worldwind/util/tree/TreeLayout.java | 28 +- .../nasa/worldwind/util/tree/TreeModel.java | 28 +- .../nasa/worldwind/util/tree/TreeNode.java | 28 +- .../nasa/worldwind/util/tree/TreePath.java | 28 +- .../nasa/worldwind/util/tree/TreeUtil.java | 30 +- .../util/tree/WindowShadeAnimation.java | 28 +- .../worldwind/util/tree/package-info.java | 39 + src/gov/nasa/worldwind/util/tree/package.html | 20 - .../util/webview/AbstractWebView.java | 41 +- .../util/webview/BasicWebViewFactory.java | 30 +- .../worldwind/util/webview/MacWebView.java | 30 +- .../worldwind/util/webview/MacWebViewJNI.java | 30 +- .../util/webview/WebResourceResolver.java | 28 +- .../nasa/worldwind/util/webview/WebView.java | 68 +- .../util/webview/WebViewFactory.java | 30 +- .../util/webview/WebViewTexture.java | 32 +- .../util/webview/WindowsWebView.java | 39 +- .../util/webview/WindowsWebViewJNI.java | 42 +- .../worldwind/util/webview/package-info.java | 55 + .../nasa/worldwind/util/webview/package.html | 38 - .../util/wizard/DefaultPanelDescriptor.java | 28 +- .../nasa/worldwind/util/wizard/Wizard.java | 28 +- .../util/wizard/WizardController.java | 28 +- .../worldwind/util/wizard/WizardModel.java | 28 +- .../util/wizard/WizardPanelDescriptor.java | 28 +- .../util/wizard/WizardProperties.java | 28 +- .../util/xml/AbstractXMLEventParser.java | 34 +- .../util/xml/AngleXMLEventParser.java | 28 +- .../xml/AttributesOnlyXMLEventParser.java | 28 +- .../util/xml/BasicXMLEventParserContext.java | 28 +- .../xml/BooleanIntegerXMLEventParser.java | 28 +- .../util/xml/BooleanXMLEventParser.java | 28 +- .../util/xml/DoubleXMLEventParser.java | 28 +- .../util/xml/IntegerXMLEventParser.java | 28 +- .../util/xml/StringListXMLEventParser.java | 28 +- .../util/xml/StringSetXMLEventParser.java | 28 +- .../util/xml/StringXMLEventParser.java | 28 +- .../util/xml/UnrecognizedXMLEventParser.java | 28 +- .../worldwind/util/xml/XMLEventParser.java | 28 +- .../util/xml/XMLEventParserContext.java | 32 +- .../xml/XMLEventParserContextFactory.java | 30 +- .../util/xml/XMLParserNotification.java | 28 +- .../xml/XMLParserNotificationListener.java | 28 +- .../util/xml/atom/AtomAbstractObject.java | 28 +- .../util/xml/atom/AtomConstants.java | 28 +- .../worldwind/util/xml/atom/AtomLink.java | 28 +- .../util/xml/atom/AtomParserContext.java | 28 +- .../worldwind/util/xml/atom/AtomPerson.java | 28 +- .../worldwind/util/xml/atom/package-info.java | 34 + .../nasa/worldwind/util/xml/atom/package.html | 16 - .../util/xml/xal/XALAbstractObject.java | 28 +- .../worldwind/util/xml/xal/XALAddress.java | 28 +- .../util/xml/xal/XALAddressDetails.java | 28 +- .../util/xml/xal/XALAddressLine.java | 28 +- .../util/xml/xal/XALAddressLines.java | 28 +- .../util/xml/xal/XALAdministrativeArea.java | 28 +- .../worldwind/util/xml/xal/XALConstants.java | 28 +- .../worldwind/util/xml/xal/XALCountry.java | 28 +- .../util/xml/xal/XALCountryName.java | 28 +- .../util/xml/xal/XALCountryNameCode.java | 28 +- .../worldwind/util/xml/xal/XALLocality.java | 28 +- .../util/xml/xal/XALParserContext.java | 28 +- .../xml/xal/XALPostalServiceElements.java | 28 +- .../util/xml/xal/XALThoroughfare.java | 28 +- .../worldwind/util/xml/xal/package-info.java | 36 + .../nasa/worldwind/util/xml/xal/package.html | 18 - src/gov/nasa/worldwind/view/BasicView.java | 38 +- .../view/BasicViewPropertyLimits.java | 40 +- .../worldwind/view/ViewElevationAnimator.java | 28 +- .../worldwind/view/ViewPropertyAccessor.java | 28 +- .../worldwind/view/ViewPropertyLimits.java | 28 +- src/gov/nasa/worldwind/view/ViewUtil.java | 32 +- .../view/firstperson/BasicFlyView.java | 210 +- .../firstperson/FlyToFlyViewAnimator.java | 28 +- .../view/firstperson/FlyViewInputHandler.java | 28 +- .../view/firstperson/FlyViewLimits.java | 28 +- .../worldwind/view/orbit/BasicOrbitView.java | 30 +- .../view/orbit/BasicOrbitViewLimits.java | 41 +- .../worldwind/view/orbit/FlatOrbitView.java | 29 +- .../view/orbit/FlyToOrbitViewAnimator.java | 28 +- .../nasa/worldwind/view/orbit/OrbitView.java | 34 +- .../view/orbit/OrbitViewCenterAnimator.java | 28 +- .../view/orbit/OrbitViewCollisionSupport.java | 28 +- .../view/orbit/OrbitViewEyePointAnimator.java | 28 +- .../view/orbit/OrbitViewInputHandler.java | 28 +- .../view/orbit/OrbitViewInputSupport.java | 28 +- .../worldwind/view/orbit/OrbitViewLimits.java | 28 +- .../orbit/OrbitViewMoveToZoomAnimator.java | 28 +- .../view/orbit/OrbitViewPropertyAccessor.java | 28 +- src/gov/nasa/worldwind/view/package-info.java | 57 + src/gov/nasa/worldwind/view/package.html | 40 - src/gov/nasa/worldwind/wms/BoundingBox.java | 28 +- src/gov/nasa/worldwind/wms/Capabilities.java | 28 +- .../worldwind/wms/CapabilitiesRequest.java | 28 +- .../nasa/worldwind/wms/CapabilitiesV111.java | 28 +- .../nasa/worldwind/wms/CapabilitiesV130.java | 28 +- src/gov/nasa/worldwind/wms/Request.java | 28 +- .../worldwind/wms/WMSNamespaceContext.java | 31 +- .../worldwind/wms/WMSTiledImageLayer.java | 28 +- .../applications/antenna/AntennaAxes.java | 32 +- .../applications/antenna/AntennaModel.java | 30 +- .../applications/antenna/AntennaViewer.java | 30 +- .../applications/antenna/Interpolator2D.java | 32 +- .../dataimporter/ColorAllocator.java | 28 +- .../dataimporter/DataInstaller.java | 30 +- .../dataimporter/DataInstallerApp.java | 98 +- .../dataimporter/DataInstallerPanel.java | 28 +- .../DataInstallerProgressMonitor.java | 28 +- .../applications/dataimporter/FileSet.java | 28 +- .../dataimporter/FileSetFilter.java | 28 +- .../dataimporter/FileSetFinder.java | 28 +- .../dataimporter/FileSetHighlighter.java | 33 +- .../applications/dataimporter/FileSetMap.java | 28 +- .../dataimporter/FileSetPanel.java | 28 +- .../FileSetPreviewImageGenerator.java | 28 +- .../applications/dataimporter/FileSetRPF.java | 28 +- .../dataimporter/FileSetTable.java | 28 +- .../dataimporter/FileSetTableModel.java | 28 +- .../dataimporter/FileStoreDataSet.java | 36 +- .../dataimporter/FileStoreDataSetFinder.java | 28 +- .../dataimporter/FileStorePanel.java | 28 +- .../FileStoreSectorHighlighter.java | 31 +- .../dataimporter/FileStoreTable.java | 28 +- .../dataimporter/FileStoreTableModel.java | 28 +- .../applications/dataimporter/LayersMenu.java | 30 +- .../dataimporter/TableCellColorRenderer.java | 28 +- .../applications/glider/GliderImage.java | 28 +- .../applications/glider/GliderImageLayer.java | 200 +- .../glider/GliderRegionOfInterest.java | 28 +- .../applications/glider/GliderTestApp.java | 154 +- .../glider/GliderWorldWindow.java | 28 +- .../applications/sar/AboutDialog.java | 28 +- .../applications/sar/AnalysisPanel.java | 28 +- .../applications/sar/BulkDownloadFrame.java | 28 +- .../applications/sar/CloudCeiling.java | 28 +- .../applications/sar/CloudCeilingPanel.java | 28 +- .../applications/sar/ControlPanel.java | 28 +- .../applications/sar/ElementParser.java | 52 +- .../applications/sar/ElevationPlane.java | 30 +- .../applications/sar/HelpFrame.java | 28 +- .../applications/sar/LayerMenu.java | 28 +- .../applications/sar/LicenseAgreement.java | 28 +- .../applications/sar/LicenseDialog.java | 28 +- .../sar/NOSALicenseAgreement.java | 31 - .../applications/sar/OSXAdapter.java | 28 +- .../applications/sar/PositionTable.java | 28 +- .../sar/PositionsContextMenu.java | 28 +- .../worldwindx/applications/sar/SAR2.java | 64 +- .../worldwindx/applications/sar/SARAbout.html | 32 +- .../applications/sar/SARAboutDialog.java | 28 +- .../applications/sar/SARAnnotation.java | 28 +- .../applications/sar/SARAnnotationReader.java | 28 +- .../sar/SARAnnotationSupport.java | 28 +- .../applications/sar/SARAnnotationWriter.java | 28 +- .../worldwindx/applications/sar/SARApp.java | 64 +- .../worldwindx/applications/sar/SARHelp.html | 30 +- .../worldwindx/applications/sar/SARKey.java | 28 +- .../applications/sar/SARPosition.java | 28 +- .../applications/sar/SARSegmentPlane.java | 28 +- .../worldwindx/applications/sar/SARTrack.java | 28 +- .../applications/sar/SARTrackBuilder.java | 28 +- .../sar/SARTrackExtensionTool.java | 28 +- .../applications/sar/SaveTrackDialog.java | 28 +- .../applications/sar/ScalebarHint.java | 28 +- .../applications/sar/TerrainProfilePanel.java | 536 +++-- .../applications/sar/TrackController.java | 370 ++-- .../applications/sar/TrackPanel.java | 28 +- .../applications/sar/TrackViewPanel.java | 28 +- .../applications/sar/TracksPanel.java | 28 +- .../applications/sar/UserPreferenceUtils.java | 28 +- .../worldwindx/applications/sar/ViewMenu.java | 32 +- .../worldwindx/applications/sar/WWPanel.java | 28 +- .../actions/AddOffsetToPositionsAction.java | 28 +- .../sar/actions/AppendPositionAction.java | 28 +- .../sar/actions/DeletePositionsAction.java | 28 +- .../sar/actions/InsertPositionAction.java | 28 +- .../sar/actions/SARScreenShotAction.java | 28 +- .../applications/sar/config/SAR.properties | 34 +- .../applications/sar/render/PlaneModel.java | 137 +- .../sar/render/ScreenElevationLine.java | 30 +- .../sar/render/TrackSegmentInfo.java | 30 +- .../sar/segmentplane/SegmentPlane.java | 28 +- .../segmentplane/SegmentPlaneAttributes.java | 30 +- .../segmentplane/SegmentPlaneController.java | 30 +- .../sar/segmentplane/SegmentPlaneEditor.java | 28 +- .../segmentplane/SegmentPlaneRenderer.java | 30 +- .../sar/tracks/AbstractTrackReader.java | 28 +- .../sar/tracks/CSVTrackReader.java | 28 +- .../sar/tracks/CompoundFilter.java | 28 +- .../sar/tracks/GPXTrackReader.java | 28 +- .../sar/tracks/NMEATrackReader.java | 28 +- .../sar/tracks/SaveTrackFilter.java | 28 +- .../applications/sar/tracks/TrackReader.java | 28 +- .../sar/tracks/TrackReaderFilter.java | 28 +- .../applications/sar/tracks/TrackWriter.java | 28 +- .../applications/sar/worldwind-nosa-1.3.html | 292 --- .../applications/worldwindow/WorldWindow.java | 30 +- .../worldwindow/config/AppConfiguration.xml | 37 +- .../config/InitialLayerConfiguration.xml | 28 +- .../config/worldwindow.worldwind.xml | 30 +- .../worldwindow/core/AbstractMenu.java | 28 +- .../worldwindow/core/AppConfiguration.java | 28 +- .../worldwindow/core/AppFrame.java | 28 +- .../worldwindow/core/AppFrameImpl.java | 28 +- .../worldwindow/core/AppPanel.java | 28 +- .../worldwindow/core/AppPanelImpl.java | 28 +- .../worldwindow/core/Constants.java | 28 +- .../worldwindow/core/Controller.java | 31 +- .../core/ExternalLinkController.java | 28 +- .../worldwindow/core/IconController.java | 28 +- .../worldwindow/core/ImageLibrary.java | 28 +- .../worldwindow/core/InfoPanelController.java | 28 +- .../worldwindow/core/Initializable.java | 28 +- .../applications/worldwindow/core/Menu.java | 28 +- .../worldwindow/core/MenuBar.java | 28 +- .../worldwindow/core/MenuBarImpl.java | 28 +- .../worldwindow/core/Registry.java | 30 +- .../worldwindow/core/SimpleImporter.java | 121 +- .../worldwindow/core/StatusPanel.java | 28 +- .../worldwindow/core/ToolBar.java | 28 +- .../worldwindow/core/ToolBarImpl.java | 28 +- .../worldwindow/core/ToolTipAnnotation.java | 28 +- .../worldwindow/core/ToolTipController.java | 28 +- .../worldwindow/core/Version.java | 30 +- .../worldwindow/core/WMSLayerInfo.java | 28 +- .../applications/worldwindow/core/WWMenu.java | 28 +- .../worldwindow/core/WWODialog.java | 28 +- .../worldwindow/core/WWOPanel.java | 28 +- .../worldwindow/core/WWPanel.java | 28 +- .../worldwindow/core/WWPanelImpl.java | 30 +- .../layermanager/ActiveLayersManager.java | 28 +- .../core/layermanager/LayerManager.java | 28 +- .../core/layermanager/LayerPath.java | 28 +- .../features/AbstractApplicationFeature.java | 28 +- .../features/AbstractElevationsFeature.java | 28 +- .../worldwindow/features/AbstractFeature.java | 28 +- .../features/AbstractFeatureDialog.java | 28 +- .../features/AbstractFeatureLayer.java | 28 +- .../features/AbstractFeaturePanel.java | 28 +- .../AbstractOnDemandLayerFeature.java | 28 +- .../features/AbstractOpenResourceFeature.java | 28 +- .../worldwindow/features/Compass.java | 28 +- .../features/CoordinatesDisplay.java | 28 +- .../worldwindow/features/Crosshair.java | 28 +- .../worldwindow/features/DataImportUtil.java | 36 +- .../worldwindow/features/Feature.java | 28 +- .../worldwindow/features/FeaturePanel.java | 28 +- .../worldwindow/features/FileMenu.java | 28 +- .../worldwindow/features/GazetteerPanel.java | 28 +- .../worldwindow/features/Graticule.java | 28 +- .../worldwindow/features/GraticuleLayer.java | 28 +- .../features/ImportedDataDialog.java | 38 +- .../features/ImportedDataPanel.java | 36 +- .../worldwindow/features/LatLonGraticule.java | 28 +- .../worldwindow/features/Measurement.java | 28 +- .../features/MeasurementDialog.java | 28 +- .../features/MeasurementPanel.java | 319 +-- .../worldwindow/features/Navigation.java | 28 +- .../features/NetworkActivitySignal.java | 28 +- .../worldwindow/features/OpenFile.java | 28 +- .../worldwindow/features/OpenURL.java | 28 +- .../worldwindow/features/ScaleBar.java | 28 +- .../worldwindow/features/StatusPanelImpl.java | 30 +- .../worldwindow/features/UTMGraticule.java | 28 +- .../worldwindow/features/WMSDialog.java | 28 +- .../worldwindow/features/WMSPanel.java | 30 +- .../worldwindow/features/YahooGazetteer.java | 28 +- .../swinglayermanager/ActiveLayersList.java | 28 +- .../swinglayermanager/ActiveLayersPanel.java | 30 +- .../swinglayermanager/ControlsPanel.java | 28 +- .../swinglayermanager/ControlsPanelImpl.java | 28 +- .../swinglayermanager/LayerManagerDialog.java | 28 +- .../swinglayermanager/LayerManagerPanel.java | 30 +- .../features/swinglayermanager/LayerNode.java | 28 +- .../features/swinglayermanager/LayerTree.java | 28 +- .../swinglayermanager/LayerTreeGroupNode.java | 28 +- .../swinglayermanager/LayerTreeModel.java | 30 +- .../swinglayermanager/LayerTreeNode.java | 28 +- .../applications/worldwindow/util/GB.java | 28 +- .../worldwindow/util/LayerTree.java | 28 +- .../worldwindow/util/PanelTitle.java | 28 +- .../worldwindow/util/ShadedPanel.java | 28 +- .../applications/worldwindow/util/Util.java | 28 +- .../worldwindow/util/WMSLayerTree.java | 28 +- .../worldwindow/util/WWOUnitsFormat.java | 28 +- .../util/measuretool/WWOMeasureDisplay.java | 28 +- .../util/measuretool/WWOMeasureTool.java | 711 +++---- .../WWOMeasureToolControlPoints.java | 28 +- .../worldwindx/examples/AirspaceBuilder.java | 1064 ++++------ .../nasa/worldwindx/examples/Airspaces.java | 34 +- .../nasa/worldwindx/examples/AlarmIcons.java | 34 +- .../worldwindx/examples/AnimatedGlobe.java | 34 +- .../examples/AnnotationControls.java | 32 +- .../nasa/worldwindx/examples/Annotations.java | 34 +- .../examples/ApplicationTemplate.java | 217 +- .../nasa/worldwindx/examples/Balloons.java | 85 +- .../examples/BathymetryRemoval.java | 32 +- src/gov/nasa/worldwindx/examples/Boxes.java | 32 +- .../worldwindx/examples/BulkDownload.java | 34 +- .../examples/BulkDownloadPanel.java | 28 +- .../examples/CacheLocationConfiguration.java | 36 +- .../examples/ClickAndGoSelectListener.java | 28 +- src/gov/nasa/worldwindx/examples/Cones.java | 32 +- .../ConfiguringGLRuntimeCapabilities.java | 58 +- .../examples/ContextMenusOnShapes.java | 173 +- .../examples/ContourBuilderExample.java | 35 +- .../worldwindx/examples/ContourLines.java | 77 +- .../examples/CustomElevationModel.java | 34 +- .../nasa/worldwindx/examples/Cylinders.java | 32 +- .../examples/DebuggingGLErrors.java | 71 +- .../nasa/worldwindx/examples/DeepPicking.java | 32 +- .../nasa/worldwindx/examples/DetailHints.java | 30 +- .../worldwindx/examples/DimGlobeSurface.java | 30 +- .../worldwindx/examples/DraggingShapes.java | 34 +- .../worldwindx/examples/EGM96Offsets.java | 30 +- .../examples/ElevationsAllZero.java | 30 +- .../nasa/worldwindx/examples/Ellipsoids.java | 32 +- .../examples/ExportImageOrElevations.java | 30 +- .../ExtrudedPolygonWithBaseDepth.java | 30 +- .../worldwindx/examples/ExtrudedPolygons.java | 30 +- .../ExtrudedPolygonsFromShapefile.java | 30 +- .../worldwindx/examples/ExtrudedShapes.java | 118 +- .../nasa/worldwindx/examples/FlatWorld.java | 30 +- .../examples/FlatWorldEarthquakes.java | 32 +- .../worldwindx/examples/FlatWorldPanel.java | 28 +- .../worldwindx/examples/GARSGraticule.java | 30 +- .../nasa/worldwindx/examples/GPSTracks.java | 30 +- .../worldwindx/examples/GazetteerApp.java | 33 +- .../worldwindx/examples/GazetteerPanel.java | 39 +- .../worldwindx/examples/GeoJSONLoader.java | 28 +- src/gov/nasa/worldwindx/examples/GeoRSS.java | 204 +- .../examples/GetBestElevations.java | 121 +- .../examples/GlobeAnnotationExample.java | 30 +- .../examples/GoToCoordinatePanel.java | 35 +- .../nasa/worldwindx/examples/Graticule.java | 30 +- .../examples/GraticuleAttributesPanel.java | 28 +- .../worldwindx/examples/HelloWorldWind.java | 32 +- .../examples/HighResolutionTerrainTest.java | 28 +- .../nasa/worldwindx/examples/IconPicking.java | 30 +- .../examples/KeepingObjectsInView.java | 294 ++- .../nasa/worldwindx/examples/LayerPanel.java | 28 +- .../worldwindx/examples/LayerTreeUsage.java | 32 +- .../worldwindx/examples/LineBackground.java | 103 +- .../nasa/worldwindx/examples/LineBuilder.java | 324 ++- .../worldwindx/examples/LocalDataOnly.java | 30 +- .../worldwindx/examples/LoggingControl.java | 38 +- .../examples/MGRSAttributesPanel.java | 28 +- .../worldwindx/examples/MGRSGraticule.java | 30 +- src/gov/nasa/worldwindx/examples/Markers.java | 30 +- .../worldwindx/examples/MarkersOrder.java | 30 +- .../worldwindx/examples/MeasureToolPanel.java | 489 ++--- .../worldwindx/examples/MeasureToolUsage.java | 112 +- .../worldwindx/examples/MultiResPath.java | 83 +- .../examples/NetworkOfflineMode.java | 30 +- .../examples/OnScreenLayerManager.java | 30 +- .../examples/OpenGLSupportTest.java | 34 +- .../worldwindx/examples/ParallelPaths.java | 30 +- .../examples/PathPositionColors.java | 35 +- src/gov/nasa/worldwindx/examples/Paths.java | 67 +- .../worldwindx/examples/PathsOnDateline.java | 28 +- .../examples/PathsWithDirection.java | 30 +- .../worldwindx/examples/PathsWithLabels.java | 30 +- .../examples/PersistSessionState.java | 32 +- .../nasa/worldwindx/examples/PickFrustum.java | 32 +- .../nasa/worldwindx/examples/PlaceNames.java | 30 +- .../worldwindx/examples/PlaceNamesPanel.java | 28 +- .../examples/PlacemarkDecluttering.java | 32 +- .../examples/PlacemarkLabelEditing.java | 30 +- .../nasa/worldwindx/examples/Placemarks.java | 32 +- .../nasa/worldwindx/examples/Polygons.java | 30 +- .../nasa/worldwindx/examples/Pyramids.java | 30 +- .../nasa/worldwindx/examples/RadarVolume.java | 30 +- .../examples/RadarVolumeExample.java | 28 +- .../examples/RemoteSurfaceImage.java | 32 +- .../nasa/worldwindx/examples/RigidShapes.java | 30 +- .../worldwindx/examples/RotatedSector.java | 28 +- .../worldwindx/examples/RubberSheetImage.java | 30 +- .../worldwindx/examples/ScankortDenmark.java | 82 - .../examples/ScreenImageDragging.java | 28 +- .../worldwindx/examples/ScreenSelection.java | 32 +- .../nasa/worldwindx/examples/ScreenShots.java | 28 +- .../worldwindx/examples/SectorSelection.java | 28 +- .../worldwindx/examples/ShapeClipping.java | 34 +- .../examples/ShapeClippingPanel.java | 28 +- .../worldwindx/examples/ShapeCombining.java | 34 +- .../worldwindx/examples/ShapeEditing.java | 33 +- .../examples/ShapeEditingExtension.java | 32 +- .../examples/ShapefileAttributeGroups.java | 30 +- .../worldwindx/examples/ShapefileViewer.java | 34 +- .../nasa/worldwindx/examples/Shapefiles.java | 36 +- src/gov/nasa/worldwindx/examples/Shapes.java | 762 ++++--- .../nasa/worldwindx/examples/Shutdown.java | 34 +- .../examples/SimpleShapeDragging.java | 28 +- .../examples/SimplestPossibleExample.java | 28 +- .../worldwindx/examples/SplitPaneUsage.java | 34 +- src/gov/nasa/worldwindx/examples/Stereo.java | 30 +- .../examples/SurfaceImageViewer.java | 38 +- .../worldwindx/examples/SurfaceImages.java | 99 +- .../worldwindx/examples/SurfaceShapes.java | 33 +- .../worldwindx/examples/SurfaceTextUsage.java | 30 +- .../worldwindx/examples/TabbedPaneUsage.java | 32 +- .../examples/TerrainIntersections.java | 318 ++- .../worldwindx/examples/TerrainProfiler.java | 176 +- .../worldwindx/examples/TreeFiltering.java | 30 +- .../worldwindx/examples/VPFLayerDemo.java | 36 +- .../worldwindx/examples/VideoOnTerrain.java | 30 +- .../worldwindx/examples/ViewControls.java | 149 +- .../worldwindx/examples/ViewIteration.java | 32 +- .../nasa/worldwindx/examples/ViewLimits.java | 28 +- .../worldwindx/examples/ViewLookAround.java | 139 +- .../worldwindx/examples/WCSElevations.java | 32 +- .../worldwindx/examples/WMSLayerManager.java | 32 +- .../worldwindx/examples/WMSLayersPanel.java | 36 +- .../examples/WebBrowserBalloons.java | 40 +- src/gov/nasa/worldwindx/examples/Wedges.java | 30 +- .../examples/WorldWindDiagnostics.java | 187 +- .../examples/analytics/AnalyticSurface.java | 40 +- .../analytics/AnalyticSurfaceAttributes.java | 28 +- .../analytics/AnalyticSurfaceDemo.java | 34 +- .../analytics/AnalyticSurfaceLegend.java | 28 +- .../analytics/ExportAsKMLGroundOverlay.java | 28 +- .../analytics/ExportableAnalyticSurface.java | 30 +- .../examples/data/BrowserBalloonExample.html | 30 +- .../data/CacheLocationConfiguration.xml | 32 +- .../examples/data/CustomElevationModel.xml | 28 +- .../data/ShapefileAttributeGroups.xml | 28 +- .../examples/dataimport/DataInstallUtil.java | 36 +- .../examples/dataimport/ImportElevations.java | 32 +- .../examples/dataimport/ImportImagery.java | 32 +- .../examples/dataimport/InstallDTED.java | 30 +- .../dataimport/InstallElevations.java | 34 +- .../examples/dataimport/InstallImagery.java | 34 +- .../InstallImageryAndElevationsDemo.java | 54 +- .../dataimport/InstalledDataPanel.java | 40 +- .../examples/dataimport/package-info.java | 128 ++ .../examples/dataimport/package.html | 116 -- .../elevations/RetrieveElevations.java | 32 +- .../worldwindx/examples/kml/ExportKML.java | 30 +- .../kml/KMLApplicationController.java | 36 +- .../examples/kml/KMLDocumentBuilder.java | 28 +- .../examples/kml/KMLFlyViewController.java | 28 +- .../examples/kml/KMLOrbitViewController.java | 28 +- .../examples/kml/KMLViewController.java | 30 +- .../worldwindx/examples/kml/KMLViewer.java | 38 +- .../examples/kml/KMZDocumentBuilder.java | 28 +- .../worldwindx/examples/kml/package-info.java | 39 + .../nasa/worldwindx/examples/kml/package.html | 24 - .../ElevationModelManagerPanel.java | 28 +- .../layermanager/ElevationModelPanel.java | 28 +- .../LayerAndElevationManagerPanel.java | 28 +- .../layermanager/LayerManagerApp.java | 34 +- .../layermanager/LayerManagerPanel.java | 32 +- .../examples/layermanager/LayerPanel.java | 28 +- .../AbstractShapeIntersection.java | 30 +- .../ExtrudedPolygonIntersection.java | 30 +- .../examples/lineofsight/GridOfPoints.java | 30 +- .../examples/lineofsight/LineIntersector.java | 28 +- .../examples/lineofsight/LinesOfSight.java | 48 +- .../examples/lineofsight/PointGrid.java | 32 +- .../lineofsight/PolygonIntersection.java | 30 +- .../lineofsight/ShapeLineIntersector.java | 28 +- .../lineofsight/TerrainLineIntersector.java | 28 +- .../examples/lineofsight/package-info.java | 40 + .../examples/lineofsight/package.html | 25 - .../examples/multiwindow/CardLayoutUsage.java | 74 +- .../multiwindow/FlatAndRoundGlobes.java | 42 +- .../examples/multiwindow/MultiFrame.java | 58 +- .../examples/multiwindow/SharedShapes.java | 64 +- .../examples/multiwindow/TabbedPaneUsage.java | 62 +- .../examples/multiwindow/ViewViewVolume.java | 44 +- .../multiwindow/ViewVolumeViewer.java | 28 +- .../examples/multiwindow/package-info.java | 49 + .../examples/multiwindow/package.html | 32 - .../shapebuilder/AbstractShapeEditor.java | 32 +- .../examples/shapebuilder/BoxEditor.java | 28 +- .../examples/shapebuilder/ConeEditor.java | 28 +- .../examples/shapebuilder/CylinderEditor.java | 28 +- .../shapebuilder/ExtrudedPolygonBuilder.java | 30 +- .../shapebuilder/ExtrudedPolygonEditor.java | 28 +- .../examples/shapebuilder/PyramidEditor.java | 28 +- .../shapebuilder/RigidShapeBuilder.java | 46 +- .../shapebuilder/RigidShapeEditor.java | 28 +- .../examples/shapebuilder/WedgeEditor.java | 28 +- .../examples/shapebuilder/package-info.java | 101 + .../examples/shapebuilder/package.html | 85 - .../symbology/DeclutterTacticalSymbols.java | 34 +- .../symbology/IconRetrieverUsage.java | 34 +- .../examples/symbology/Symbology.java | 50 +- .../examples/symbology/TacticalGraphics.java | 51 +- .../examples/symbology/TacticalSymbols.java | 61 +- .../examples/symbology/package-info.java | 36 + .../examples/symbology/package.html | 22 - .../worldwindx/examples/tutorial/Cube.java | 41 +- .../worldwindx/examples/util/AudioPlayer.java | 28 +- .../examples/util/AudioPlayerAnnotation.java | 28 +- .../util/AudioPlayerAnnotationController.java | 28 +- .../examples/util/BalloonController.java | 64 +- .../util/BalloonResizeController.java | 30 +- .../examples/util/ButtonAnnotation.java | 32 +- .../examples/util/DialogAnnotation.java | 30 +- .../util/DialogAnnotationController.java | 28 +- .../examples/util/DirectedPath.java | 46 +- .../util/DirectedSurfacePolyline.java | 36 +- .../worldwindx/examples/util/ExampleUtil.java | 28 +- .../util/ExtentVisibilitySupport.java | 36 +- .../examples/util/FileStoreDataSet.java | 28 +- .../examples/util/HighlightController.java | 34 +- .../examples/util/HotSpotController.java | 54 +- .../examples/util/ImageAnnotation.java | 30 +- .../worldwindx/examples/util/LabeledPath.java | 32 +- .../examples/util/LayerManagerLayer.java | 46 +- .../util/OpenStreetMapShapefileLoader.java | 37 +- .../examples/util/PowerOfTwoPaddedImage.java | 30 +- .../examples/util/ProgressAnnotation.java | 30 +- .../examples/util/RandomShapeAttributes.java | 28 +- .../examples/util/ScreenSelector.java | 65 +- .../examples/util/ScreenShotAction.java | 30 +- .../examples/util/SectorSelector.java | 28 +- .../examples/util/SessionState.java | 28 +- .../worldwindx/examples/util/ShapeUtils.java | 28 +- .../examples/util/ShapefileLoader.java | 37 +- .../examples/util/SlideShowAnnotation.java | 28 +- .../util/SlideShowAnnotationController.java | 28 +- .../worldwindx/examples/util/StatusLayer.java | 32 +- .../examples/util/SurfaceImageEditor.java | 28 +- .../worldwindx/examples/util/ToolTip.java | 28 +- .../examples/util/ToolTipAnnotation.java | 28 +- .../examples/util/ToolTipController.java | 32 +- .../worldwindx/examples/util/TreeControl.java | 28 +- .../examples/util/ViewVolumeRenderer.java | 30 +- .../examples/util/WCSCoveragePanel.java | 34 +- .../util/cachecleaner/CacheTable.java | 28 +- .../util/cachecleaner/DataCacheViewer.java | 30 +- .../worldwindx/examples/view/AddAnimator.java | 33 +- .../worldwindx/examples/view/ViewSwitch.java | 30 +- .../performance/AirspacesEverywhere.java | 30 +- .../performance/EllipsoidsEverywhere.java | 30 +- .../ExtrudedPolygonsEverywhere.java | 30 +- .../PointPlacemarksEverywhere.java | 30 +- .../performance/PolygonsEverywhere.java | 30 +- .../SurfacePolygonsEverywhere.java | 30 +- .../worldwindx/performance/VeryManyPaths.java | 30 +- src/org/codehaus/jackson/Base64Variant.java | 37 +- src/org/codehaus/jackson/Base64Variants.java | 8 +- src/org/codehaus/jackson/JsonFactory.java | 107 +- src/org/codehaus/jackson/JsonGenerator.java | 278 ++- src/org/codehaus/jackson/JsonLocation.java | 11 +- src/org/codehaus/jackson/JsonNode.java | 112 +- src/org/codehaus/jackson/JsonParser.java | 492 ++--- .../codehaus/jackson/JsonStreamContext.java | 3 + src/org/codehaus/jackson/JsonToken.java | 7 +- src/org/codehaus/jackson/ObjectCodec.java | 76 +- src/org/codehaus/jackson/PrettyPrinter.java | 36 +- .../jackson/annotate/JsonAnySetter.java | 3 - .../jackson/annotate/JsonAutoDetect.java | 21 +- .../codehaus/jackson/annotate/JsonClass.java | 4 +- .../jackson/annotate/JsonContentClass.java | 4 +- .../codehaus/jackson/annotate/JsonGetter.java | 2 + .../codehaus/jackson/annotate/JsonIgnore.java | 3 +- .../annotate/JsonIgnoreProperties.java | 2 + .../jackson/annotate/JsonKeyClass.java | 4 +- .../jackson/annotate/JsonProperty.java | 1 + .../jackson/annotate/JsonPropertyOrder.java | 2 + .../codehaus/jackson/annotate/JsonSetter.java | 2 + .../jackson/annotate/JsonSubTypes.java | 7 +- .../jackson/annotate/JsonTypeInfo.java | 12 +- .../jackson/annotate/JsonTypeName.java | 1 + .../codehaus/jackson/annotate/JsonValue.java | 4 +- .../annotate/JsonWriteNullProperties.java | 1 + .../jackson/impl/ByteSourceBootstrapper.java | 9 +- .../jackson/impl/JsonGeneratorBase.java | 7 +- .../jackson/impl/JsonNumericParserBase.java | 12 +- .../codehaus/jackson/impl/JsonParserBase.java | 24 +- .../jackson/impl/JsonReadContext.java | 1 + .../jackson/impl/JsonWriteContext.java | 1 + .../jackson/impl/ReaderBasedParser.java | 30 +- .../jackson/impl/Utf8StreamParser.java | 51 +- .../jackson/impl/WriterBasedGenerator.java | 4 + src/org/codehaus/jackson/io/IOContext.java | 5 +- src/org/codehaus/jackson/io/NumberInput.java | 27 +- src/org/codehaus/jackson/io/NumberOutput.java | 6 + .../jackson/io/SegmentedStringWriter.java | 10 +- .../jackson/sym/BytesToNameCanonicalizer.java | 9 +- .../jackson/sym/CharsToNameCanonicalizer.java | 41 +- src/org/codehaus/jackson/type/JavaType.java | 69 +- .../codehaus/jackson/type/TypeReference.java | 4 +- .../jackson/util/ByteArrayBuilder.java | 1 + .../jackson/util/JsonParserSequence.java | 16 +- src/org/codehaus/jackson/util/TextBuffer.java | 20 +- .../codehaus/jackson/util/TokenBuffer.java | 8 + src/overview.html | 40 +- .../data/RasterServerConfigurationTest.java | 28 +- .../formats/georss/GeoRSSParserTest.java | 362 ++-- .../formats/shapefile/ShapefileTest.java | 28 +- test/gov/nasa/worldwind/geom/AngleTest.java | 28 +- .../worldwind/geom/BoundingVolumeTest.java | 28 +- test/gov/nasa/worldwind/geom/LatLonTest.java | 30 +- test/gov/nasa/worldwind/geom/LineTest.java | 28 +- test/gov/nasa/worldwind/geom/MatrixTest.java | 76 +- test/gov/nasa/worldwind/geom/PlaneTest.java | 28 +- .../globes/EllipsoidalGlobeTest.java | 28 +- .../worldwind/layers/AnnotationLayerTest.java | 28 +- .../nasa/worldwind/layers/IconLayerTest.java | 28 +- .../worldwind/layers/RenderableLayerTest.java | 28 +- .../ogc/collada/ColladaAccessorTest.java | 28 +- .../nasa/worldwind/ogc/kml/KMLExportTest.java | 28 +- .../worldwind/ogc/kml/KMLReferenceTest.java | 28 +- test/gov/nasa/worldwind/ogc/kml/KMLTest.java | 28 +- .../ogc/wcs/WCSCapabilitiesParsingTest.java | 32 +- .../wcs/WCSDescribeCoverageParsingTest.java | 28 +- .../wcs/WCSElevationModelCreationTest.java | 28 +- .../render/AnnotationAttributesTest.java | 28 +- .../worldwind/render/GlobeAnnotationTest.java | 28 +- .../nasa/worldwind/render/PedestalTest.java | 28 +- .../nasa/worldwind/render/PolygonTest.java | 28 +- .../nasa/worldwind/render/PolylineTest.java | 28 +- .../render/ScreenAnnotationTest.java | 28 +- .../worldwind/render/ShapeAttributesTest.java | 28 +- test/gov/nasa/worldwind/render/SizeTest.java | 28 +- .../worldwind/render/SurfaceShapeTest.java | 28 +- .../worldwind/render/UserFacingIconTest.java | 28 +- .../airspaces/AirspaceAttributesTest.java | 28 +- .../render/airspaces/TrackAirspaceTest.java | 28 +- .../symbology/milstd2525/MetocSidcTest.java | 28 +- .../MilStd2525IconRetrieverTest.java | 28 +- .../MilStd2525PointGraphicRetrieverTest.java | 28 +- .../MilStd2525TacticalGraphicFactoryTest.java | 30 +- .../milstd2525/MilStd2525UnitsFormatTest.java | 28 +- .../symbology/milstd2525/TacGrpSidcTest.java | 28 +- .../util/AbsentResourceListTest.java | 28 +- .../worldwind/util/BasicQuadTreeTest.java | 28 +- test/gov/nasa/worldwind/util/EGM96Test.java | 28 +- .../nasa/worldwind/util/EntityMapTest.java | 28 +- .../util/HighResolutionTerrainTest.java | 28 +- .../util/HighResolutionTerrainTest2.java | 28 +- .../worldwind/util/NetworkStatusTest.java | 30 +- test/gov/nasa/worldwind/util/OGLUtilTest.java | 30 +- test/gov/nasa/worldwind/util/WWMathTest.java | 66 + test/gov/nasa/worldwind/util/WWUtilTest.java | 28 +- .../worldwind/view/BasicOrbitViewTest.java | 28 +- testData/KML/NetworkLink01.kml | 2 +- .../NetworkLinkExpiration_expires.php | 28 +- ...inkExpiration_expires_and_link_control.php | 28 +- ...workLinkExpiration_expires_and_max_age.php | 28 +- .../NetworkLinkExpiration_max_age.php | 28 +- .../NetworkLinkExpiration_random_image.php | 28 +- testData/WCS/WCSCapabilities002.xml | 28 +- testData/WCS/WCSCapabilities003.xml | 32 +- testData/WCS/WCSDescribeCoverage001.xml | 28 +- .../ogc/collada/ColladaMovingModel.java | 32 +- .../worldwind/ogc/collada/ColladaViewer.java | 34 +- .../nasa/worldwind/ogc/kml/KMLManualTest.html | 48 +- .../worldwind/ogc/kml/StyleLocationTests.java | 30 +- .../worldwind/render/BalloonSizeTest.html | 28 +- .../render/BrowserBalloonSizeTest.java | 30 +- .../worldwind/render/BrowserBalloonTest.html | 30 +- .../worldwind/render/BrowserBalloonTest.java | 30 +- .../symbology/milstd2525/AllModifiers.java | 34 +- .../milstd2525/AllPointGraphics.java | 46 +- .../milstd2525/AllTacticalSymbols.java | 42 +- .../symbology/milstd2525/Frames.java | 36 +- .../nasa/worldwind/util/TreeNativeSize.java | 28 +- travis/add_daily_tag.sh | 43 - travis/changelog.sh | 32 + travis/update_release.sh | 189 -- travis/update_website.sh | 68 - webstart/AirspaceBuilder.jnlp | 46 - webstart/Airspaces.jnlp | 46 - webstart/AnaglyphStereo.jnlp | 46 - webstart/AnalyticSurface.jnlp | 49 - webstart/AnnotationControls.jnlp | 46 - webstart/Annotations.jnlp | 46 - webstart/ApplicationTemplate.jnlp | 46 - webstart/ExportImageOrElevations.jnlp | 46 - webstart/ExtrudedShapes.jnlp | 46 - webstart/FlatWorld.jnlp | 46 - webstart/FlatWorldEarthquakes.jnlp | 46 - webstart/InstallImageryAndElevationsDemo.jnlp | 50 - webstart/JavaWebStartTemplate.jnlp | 57 - webstart/KMLViewer.jnlp | 46 - webstart/KeepingObjectsInView.jnlp | 46 - webstart/LineBuilder.jnlp | 46 - webstart/MGRSGraticule.jnlp | 46 - webstart/MultiWindowViewVolume.jnlp | 46 - webstart/RigidShapes.jnlp | 46 - webstart/SARApp.jnlp | 46 - webstart/ScankortDenmark.jnlp | 46 - webstart/SurfaceShapes.jnlp | 46 - webstart/TacticalGraphics.jnlp | 46 - webstart/TacticalSymbols.jnlp | 46 - webstart/TerrainProfiler.jnlp | 46 - webstart/VideoOnTerrain.jnlp | 46 - webstart/WMSLayerManager.jnlp | 46 - webstart/WebBrowserBalloons.jnlp | 46 - webstart/WorldWindDiagnostics.jnlp | 46 - webstart/gdal.jnlp | 90 - webstart/gluegen-rt.jnlp | 77 - webstart/jogl-all.jnlp | 76 - webstart/worldwind.jnlp | 61 - webstart/worldwindx.jnlp | 44 - 12149 files changed, 313437 insertions(+), 54365 deletions(-) delete mode 100644 .idea/ant.xml delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/NASA.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/libraries/gdal.xml delete mode 100644 .idea/libraries/jogl.xml delete mode 100644 .idea/libraries/junit4.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/projectCodeStyle.xml delete mode 100644 .idea/runConfigurations/ApplicationTemplate.xml delete mode 100644 .idea/runConfigurations/KMLViewer.xml delete mode 100644 .idea/runConfigurations/WMSLayerManager.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml create mode 100644 Apache License 2.0.pdf create mode 100644 CONTRIBUTING.md create mode 100644 ISSUE_TEMPLATE.md rename lib-external/gdal/data/LICENSE.TXT => LICENSE.gdal.TXT (100%) create mode 100644 LICENSE.jackson.txt delete mode 100644 LICENSE.txt create mode 100644 PULL_REQUEST_TEMPLATE.md delete mode 100755 WebView32.dll delete mode 100755 WebView64.dll create mode 100644 WorldWindJava-v2.2 3rd-party notices and licenses.pdf delete mode 100644 build.properties delete mode 100644 gluegen-rt-natives-linux-i586.jar delete mode 100644 gluegen-rt-natives-windows-i586.jar delete mode 100644 jogl-all-natives-linux-i586.jar delete mode 100644 jogl-all-natives-windows-i586.jar delete mode 100644 keystore.tar.enc delete mode 100644 lib-external/gdal/GDAL_License.txt create mode 100644 lib-external/jogl-gluegen/.gitignore create mode 100755 lib-external/jogl-gluegen/build-gluegen.sh create mode 100755 lib-external/jogl-gluegen/build-jogl.sh create mode 100755 lib-external/jogl-gluegen/clean-gluegen.sh create mode 100755 lib-external/jogl-gluegen/clean-jogl.sh create mode 100755 lib-external/jogl-gluegen/get-source.sh create mode 100755 lib-external/jogl-gluegen/linux-copy-jogl.sh create mode 100755 lib-external/jogl-gluegen/osx-copy-jogl.sh create mode 100644 lib-external/jogl-gluegen/win-build-gluegen.cmd create mode 100644 lib-external/jogl-gluegen/win-build-jogl.cmd create mode 100644 lib-external/jogl-gluegen/win-clean-gluegen.cmd create mode 100644 lib-external/jogl-gluegen/win-clean-jogl.cmd create mode 100644 lib-external/jogl-gluegen/win-copy-jogl.cmd delete mode 100755 libwebview.jnilib create mode 100644 nbproject/build-impl.xml create mode 100644 nbproject/configs/AirspaceBuilder.properties create mode 100644 nbproject/configs/ApplicationTemplate.properties create mode 100644 nbproject/configs/Balloons.properties create mode 100644 nbproject/configs/ContextMenusOnShapes.properties create mode 100644 nbproject/configs/ContourLines.properties create mode 100644 nbproject/configs/DataInstallerApp.properties create mode 100644 nbproject/configs/DebuggingGLErrors.properties create mode 100644 nbproject/configs/DraggingShapes.properties create mode 100644 nbproject/configs/ExtrudedShapes.properties create mode 100644 nbproject/configs/FlatWorld.properties create mode 100644 nbproject/configs/GeoRSS.properties create mode 100644 nbproject/configs/GetBestElevations.properties create mode 100644 nbproject/configs/GliderTestApp.properties create mode 100644 nbproject/configs/Graticule.properties create mode 100644 nbproject/configs/ImportImagery.properties create mode 100644 nbproject/configs/KMLViewer.properties create mode 100644 nbproject/configs/KeepObjectsInView.properties create mode 100644 nbproject/configs/LayerManagerApp.properties create mode 100644 nbproject/configs/LineBackground.properties create mode 100644 nbproject/configs/LineBuilder.properties create mode 100644 nbproject/configs/LinesOfSight.properties create mode 100644 nbproject/configs/LoggingControl.properties create mode 100644 nbproject/configs/MeasureToolUsage.properties create mode 100644 nbproject/configs/MultiFrame.properties create mode 100644 nbproject/configs/MultiResPath.properties create mode 100644 nbproject/configs/Paths.properties create mode 100644 nbproject/configs/SARApp.properties create mode 100644 nbproject/configs/Shapes.properties create mode 100644 nbproject/configs/Shutdown.properties create mode 100644 nbproject/configs/SurfaceImages.properties create mode 100644 nbproject/configs/TerrainIntersections.properties create mode 100644 nbproject/configs/TerrainProfiler.properties create mode 100644 nbproject/configs/ViewControls.properties create mode 100644 nbproject/configs/ViewLookAround.properties create mode 100644 nbproject/configs/WMSLayerManager.properties create mode 100644 nbproject/configs/WorldWindDiagnostics.properties create mode 100644 nbproject/configs/WorldWindow.properties create mode 100644 nbproject/genfiles.properties create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml rename build.macros.xml => release-build.macros.xml (72%) create mode 100644 release-build.properties create mode 100644 release-build.xml delete mode 100644 src/config/Earth/ScankortDenmarkDSMElevationModel.xml delete mode 100644 src/config/Earth/ScankortDenmarkImageLayer.xml create mode 100644 src/gov/nasa/worldwind/data/package-info.java delete mode 100644 src/gov/nasa/worldwind/data/package.html create mode 100644 src/gov/nasa/worldwind/globes/package-info.java delete mode 100644 src/gov/nasa/worldwind/globes/package.html delete mode 100644 src/gov/nasa/worldwind/layers/Earth/ScankortDenmarkImageLayer.java create mode 100644 src/gov/nasa/worldwind/ogc/collada/impl/package-info.java delete mode 100644 src/gov/nasa/worldwind/ogc/collada/impl/package.html create mode 100644 src/gov/nasa/worldwind/ogc/collada/io/package-info.java delete mode 100644 src/gov/nasa/worldwind/ogc/collada/io/package.html create mode 100644 src/gov/nasa/worldwind/ogc/collada/package-info.java delete mode 100644 src/gov/nasa/worldwind/ogc/collada/package.html create mode 100644 src/gov/nasa/worldwind/ogc/kml/gx/package-info.java delete mode 100644 src/gov/nasa/worldwind/ogc/kml/gx/package.html create mode 100644 src/gov/nasa/worldwind/ogc/kml/io/package-info.java delete mode 100644 src/gov/nasa/worldwind/ogc/kml/io/package.html create mode 100644 src/gov/nasa/worldwind/ogc/kml/package-info.java delete mode 100644 src/gov/nasa/worldwind/ogc/kml/package.html create mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/package-info.java delete mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/package.html create mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/graphics/lines/package-info.java delete mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/graphics/lines/package.html create mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/package-info.java delete mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/package.html create mode 100644 src/gov/nasa/worldwind/symbology/package-info.java delete mode 100644 src/gov/nasa/worldwind/symbology/package.html create mode 100644 src/gov/nasa/worldwind/util/layertree/package-info.java delete mode 100644 src/gov/nasa/worldwind/util/layertree/package.html create mode 100644 src/gov/nasa/worldwind/util/tree/package-info.java delete mode 100644 src/gov/nasa/worldwind/util/tree/package.html create mode 100644 src/gov/nasa/worldwind/util/webview/package-info.java delete mode 100644 src/gov/nasa/worldwind/util/webview/package.html create mode 100644 src/gov/nasa/worldwind/util/xml/atom/package-info.java delete mode 100644 src/gov/nasa/worldwind/util/xml/atom/package.html create mode 100644 src/gov/nasa/worldwind/util/xml/xal/package-info.java delete mode 100644 src/gov/nasa/worldwind/util/xml/xal/package.html create mode 100644 src/gov/nasa/worldwind/view/package-info.java delete mode 100644 src/gov/nasa/worldwind/view/package.html delete mode 100644 src/gov/nasa/worldwindx/applications/sar/NOSALicenseAgreement.java delete mode 100644 src/gov/nasa/worldwindx/applications/sar/worldwind-nosa-1.3.html delete mode 100644 src/gov/nasa/worldwindx/examples/ScankortDenmark.java create mode 100644 src/gov/nasa/worldwindx/examples/dataimport/package-info.java delete mode 100644 src/gov/nasa/worldwindx/examples/dataimport/package.html create mode 100644 src/gov/nasa/worldwindx/examples/kml/package-info.java delete mode 100644 src/gov/nasa/worldwindx/examples/kml/package.html create mode 100644 src/gov/nasa/worldwindx/examples/lineofsight/package-info.java delete mode 100644 src/gov/nasa/worldwindx/examples/lineofsight/package.html create mode 100644 src/gov/nasa/worldwindx/examples/multiwindow/package-info.java delete mode 100644 src/gov/nasa/worldwindx/examples/multiwindow/package.html create mode 100644 src/gov/nasa/worldwindx/examples/shapebuilder/package-info.java delete mode 100644 src/gov/nasa/worldwindx/examples/shapebuilder/package.html create mode 100644 src/gov/nasa/worldwindx/examples/symbology/package-info.java delete mode 100644 src/gov/nasa/worldwindx/examples/symbology/package.html create mode 100644 test/gov/nasa/worldwind/util/WWMathTest.java delete mode 100644 travis/add_daily_tag.sh create mode 100644 travis/changelog.sh delete mode 100644 travis/update_release.sh delete mode 100644 travis/update_website.sh delete mode 100644 webstart/AirspaceBuilder.jnlp delete mode 100644 webstart/Airspaces.jnlp delete mode 100644 webstart/AnaglyphStereo.jnlp delete mode 100644 webstart/AnalyticSurface.jnlp delete mode 100644 webstart/AnnotationControls.jnlp delete mode 100644 webstart/Annotations.jnlp delete mode 100644 webstart/ApplicationTemplate.jnlp delete mode 100644 webstart/ExportImageOrElevations.jnlp delete mode 100644 webstart/ExtrudedShapes.jnlp delete mode 100644 webstart/FlatWorld.jnlp delete mode 100644 webstart/FlatWorldEarthquakes.jnlp delete mode 100644 webstart/InstallImageryAndElevationsDemo.jnlp delete mode 100644 webstart/JavaWebStartTemplate.jnlp delete mode 100644 webstart/KMLViewer.jnlp delete mode 100644 webstart/KeepingObjectsInView.jnlp delete mode 100644 webstart/LineBuilder.jnlp delete mode 100644 webstart/MGRSGraticule.jnlp delete mode 100644 webstart/MultiWindowViewVolume.jnlp delete mode 100644 webstart/RigidShapes.jnlp delete mode 100644 webstart/SARApp.jnlp delete mode 100644 webstart/ScankortDenmark.jnlp delete mode 100644 webstart/SurfaceShapes.jnlp delete mode 100644 webstart/TacticalGraphics.jnlp delete mode 100644 webstart/TacticalSymbols.jnlp delete mode 100644 webstart/TerrainProfiler.jnlp delete mode 100644 webstart/VideoOnTerrain.jnlp delete mode 100644 webstart/WMSLayerManager.jnlp delete mode 100644 webstart/WebBrowserBalloons.jnlp delete mode 100644 webstart/WorldWindDiagnostics.jnlp delete mode 100644 webstart/gdal.jnlp delete mode 100644 webstart/gluegen-rt.jnlp delete mode 100644 webstart/jogl-all.jnlp delete mode 100644 webstart/worldwind.jnlp delete mode 100644 webstart/worldwindx.jnlp diff --git a/.gitignore b/.gitignore index a147dfa860..246e12a7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ .DS_Store -.idea/dictionaries +.idea/shelf + +.idea/tasks.xml + +.idea/workspace.xml build @@ -8,12 +12,9 @@ classes testClasses -keystore.properties - -keystore.tar - worldwind.jar worldwindx.jar +/dist/ +/nbproject/private/ -wwstore diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index 4fa7e1336a..0000000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 9fafc3a169..0000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 8f39e62170..0000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - diff --git a/.idea/copyright/NASA.xml b/.idea/copyright/NASA.xml deleted file mode 100644 index e79c3d8d36..0000000000 --- a/.idea/copyright/NASA.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index b7f9bb2497..0000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70d85..0000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 90eca5898e..0000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 44eb48c62a..0000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/libraries/gdal.xml b/.idea/libraries/gdal.xml deleted file mode 100644 index 89f743f896..0000000000 --- a/.idea/libraries/gdal.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/jogl.xml b/.idea/libraries/jogl.xml deleted file mode 100644 index efa4e85d84..0000000000 --- a/.idea/libraries/jogl.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/junit4.xml b/.idea/libraries/junit4.xml deleted file mode 100644 index 73b6283c49..0000000000 --- a/.idea/libraries/junit4.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 3eaa6828eb..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - http://www.w3.org/1999/xhtml - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index d9e337b55a..0000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/projectCodeStyle.xml b/.idea/projectCodeStyle.xml deleted file mode 100644 index 21c32ccf3e..0000000000 --- a/.idea/projectCodeStyle.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - diff --git a/.idea/runConfigurations/ApplicationTemplate.xml b/.idea/runConfigurations/ApplicationTemplate.xml deleted file mode 100644 index 714b6ea73e..0000000000 --- a/.idea/runConfigurations/ApplicationTemplate.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/KMLViewer.xml b/.idea/runConfigurations/KMLViewer.xml deleted file mode 100644 index 79fa526268..0000000000 --- a/.idea/runConfigurations/KMLViewer.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/WMSLayerManager.xml b/.idea/runConfigurations/WMSLayerManager.xml deleted file mode 100644 index 039dbcede8..0000000000 --- a/.idea/runConfigurations/WMSLayerManager.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b843..0000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 275077f825..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.travis.yml b/.travis.yml index 51880708c8..0eadda7688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,54 +1,45 @@ -# Directs the Travis CI build service for World Wind Java +# Directs the Travis CI build service for WorldWind Java # For more information see https://docs.travis-ci.com/user/customizing-the-build/ -# Required to install the jq JSON filter used to parse GitHub API results -dist: trusty -sudo: required - # Set up to run the Java build script per the Travis CI documentation language: java +# Configure the build to use Oracle JDK 9 jdk: - # Configure the build to use Oracle JDK 8 - - oraclejdk8 - -before_install: - # Decrypt and un-archive the files wwstore and keystore.properties which are used to sign the Web Start distribution - - openssl aes-256-cbc -K $encrypted_1799be77f389_key -iv $encrypted_1799be77f389_iv -in keystore.tar.enc -out keystore.tar -d - - tar -xf keystore.tar - # Install Apache ANT v1.9.7 in order to get the most ANT junit features required by the World Wind build script. As of - # December 2016 the Travis CI environment provided ANT v1.8.x. - - curl -o ${HOME}/apache-ant-1.9.7-bin.tar.gz https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz - - tar -xf ${HOME}/apache-ant-1.9.7-bin.tar.gz -C ${HOME} - - export PATH=${HOME}/apache-ant-1.9.7/bin:${PATH} - -before_script: - # Install the jq shell filter so we can extract data from GitHub API JSON results - # See apt configuration: https://docs.travis-ci.com/user/ci-environment/#apt-configuration - - sudo apt-get install -qq jq - - jq --version - # Ensure scripts can be executed (required if scripts are authored in Windows) - - chmod +x ./travis/*.sh - # Use xvfb to run tests that require a GUI - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 # give xvfb some time to start - + - openjdk11 + +# 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: + apt: + packages: + - ant-optional + +services: + - xvfb + +# Build the project script: - # Build the project - - ant build - -after_success: - # Push the daily tag when this build is a cron job - - ./travis/add_daily_tag.sh - # Push build artifacts to GitHub releases, push documentation and Web Start distribution to GitHub pages - - ./travis/update_release.sh - - ./travis/update_website.sh - -notifications: - # Notify the World Wind services mailing list on every build - email: - recipients: - secure: OM6MdC79yU5Q7DCaYeABrRf2feKRvJ8UsYzs9YtmMdiwR2a2Aw6yPUunp8EtGD2/SzI/kJibeL6SMrbgI9LZRDnSM6PtpxzC023ogw02WfYegCUc10j5cN6GLzdV81ZTu8FxKvfyQMAEqsgCibHPRyBTk98NbwKHzsvxZm+wjK1hNEP76J05dBn5MjOMdTPtXsy0zS/iyPq76Y8BN/+jsPn5jUY3rTeOvmt5aCW6rXyjBeoJvsyjhuxacTnGUif334LE5yzVSKv4Nmy8UQRhKTDn/BuFikaMtEi4xKpgoQyc7A6wNG0QlxsYY9yRk6dl952q4PHz3xoXJ8LApb8ymbMxXHceOdipecwAWTmlfZPv6EMOrjITPpygtVZjz23QZm07/HMEiE/4NpIE4/ie0kiIPH59qEpKfNQ72iyWS5Zg4FD+l8ofqpGUWLlBaLzGEl6XgXH6oiFm//+wfSI9OWCZKDEYK6P24X0Ncv1Gi2zY2wVZsajqesXiWRCBEEFmjVQ1iNLX7AYsZQMd3ah8++2o3/Ti5eDagPsAVWpR8ULHFNk2+R6H7OQ6acHYVWnbzYuvIkzXYMNVvQ6PZRUvbJNdfwBw15V+s1D0PvPs1Nbc/Jq7RgWMEMUnqWNxFRXEhhbjmV/i2keSA1QPBxADSUAIkZNNkzCD+3KL/rRFDug= - on_success: always - on_failure: always + - ant -f release-build.xml + +# Deployment to be re-instated when WWJ is released. +#deploy: +# # Publish API documentation to GitHub Pages +# - provider: pages +# github_token: $GITHUB_API_KEY +# local_dir: build/doc/javadoc +# skip_cleanup: true +# on: +# branch: develop +# # Create CHANGELOG.md in the current directory +# - provider: script +# script: ./travis/changelog.sh >> CHANGELOG.md +# skip_cleanup: true +# on: +# tags: true +# # Create a GitHub release and publish CHANGELOG.md to the release assets +# - provider: releases +# api_key: $GITHUB_API_KEY +# file: CHANGELOG.md +# skip_cleanup: true +# on: +# tags: true diff --git a/Apache License 2.0.pdf b/Apache License 2.0.pdf new file mode 100644 index 0000000000000000000000000000000000000000..50747cf232d2fd3d9f1e2bea8299f2dd360868eb GIT binary patch literal 196678 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 Vu`zgV#I8Sm;@pavgDxk@+IfGc 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

k%Iwed?@Kq~26h*&O=guu^<=Yz5GW6p6CC&D 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 Dkp8lD literal 0 HcmV?d00001 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..b544c7879d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,246 @@ +# Contributing to WorldWind Java + +#### Table of Contents + +[Asking Questions](#asking-questions) + +[Design and Coding Guidelines](#design-and-coding-guidelines) + +[Contributing](#contributing) +- [Reporting Bugs](#reporting-bugs) +- [Suggesting New Features](#suggesting-new-features) +- [Pull Requests](#pull-requests) + +[Resources](#resources) + +## Asking Questions + +**Please do not file an issue to ask a question.** You will get faster results by using the following resources: + +- Email the [Administrative Contact](mailto:worldwind-info@lists.nasa.gov) + +## Design and Coding Guidelines + +These design and coding guidelines are for **WorldWind Java** and do not necessarily reflect the expectations for other +WorldWind projects. + +### General + +* The project's development IDE is Apache NetBeans. The NetBeans configuration files for this project are checked in to +the code repository. They define within them global and local library links, formatting rules, etc. +* Our required target platforms are OS X, Windows, and the most popular versions of Linux. All code +and all products must run on all those systems. +* Read the WorldWind API's Overview section for a description of WorldWind architecture, design and usage. Read +the overview pages of each WorldWind package for descriptions of those. These descriptions contain critical +information that is not repeated elsewhere. To avoid making mistakes, everyone working on WorldWind must read +them before using or modifying the code. +* Most major classes need a no-argument constructor so that the declarative instantiation mechanism can work. WW +objects should avoid constructors with arguments so that they can be created generically by name. This means +they should self-configure if at all possible, drawing their parameterized info from Configuration. They should +also contain an interface to set the configuration details programmatically. +* Make field and variable names clear and easy to read. Don't label them with "my" or "m_" or some other goofy +notation. Within a class refer to all member fields with "this", e.g., this.tileCount. +* The buffers one must use to pass arrays of info to JOGL must have their byte order set to that of the machine +they're used on. Call nativeByteOrder() on NIO buffers when you deal with them, use the methods in +com.jogamp.common.nio.Buffers. +* Favor immutability (all fields final) in classes representing some small entity like a Point or Vector. +Immutable classes are fully thread safe and generally less error prone. +* Don't worry too much about frequent memory allocations. Java is now so optimized for this that allocating an +object on the heap has similar performance to allocating it on the stack, and this includes the cost of garbage +collection. There is still a cost to executing any code, however, so be smart about allocation frequency. +* Configuration items typically have two values and thus two attribute names: a DEFAULT value that is used if not +overridden, and a non-default value that can be set programmatically (in Configuration) to a current value +without losing the ability to recover the default value. +* Classes such as BasicDataFileStore and the logger are effectively singletons but they are not defined in their +class definition as such. Their singleton nature comes from their 1:1 association with the truly singleton +WorldWind class, which provides access to instances of these "singleton" classes. +* Do not use classes that are not available in the standard JRE. Don't incur additional or external +dependencies. The only 3rd-party library we rely on is JOGL. +* Constants are defined as String and namespace qualified. This enables easy and non-conflicting extension. +* Do not use GUI builders to generate interfaces for examples or applications. They prevent others from being able +to maintain the code. +* Protect OpenGL state within a rendering unit, such as a layer, by bracketing state changes within try/finally +clauses. The util.OpenGLStackHandler utility class makes this easy. It manages both attribute state and matrices when it fails. +* WorldWind never crashes. Always catch exceptions at least at the highest entry point from the runtime, e.g., UI +listeners, thread run() methods. +* Within a rendering pass WorldWind does not touch the disk or the network. Always fork off a thread to do that. +Use the TaskManager and Retriever systems to start threads during rendering. These are set up to govern thread +usage to avoid swamping the local machine and the server. +* Too much micromanagement of state makes the code brittle. Try to design so that the right thing just happens +once things are set up, and the effect of something going wrong is benign. For example, Layers fork off +Retriever objects to retrieve data from the network. But they don't try to keep track of these. If the retriever +succeeds then the data will be available the next time the layer looks for it. The fact that it's not there +because of a timeout or something tells the layer to ask for it again if it needs it. +* DOMs are expensive in memory and time. Use an event for any documents that might be large. Use the parser in +gov.nasa.worldwind.util.xml when appropriate. + +### Exceptions + +* WW objects running in the Main thread pass exceptions through to the application unless there's good +reactive/corrective behavior that can be applied within WW. + +## Contributing + +* Log any exceptions prior to throwing them. Use the same message for the log as for the exception. +* Ensure all exception messages are generated using the i18n method details below. +* Public methods validate their arguments and throw the appropriate exception, typically InvalidArgumentException, +and identify the exception message the parameter name and the problem -- null, out of range, etc. See the +message resource file, util.MessageStrings.properties, for common messages and their identifiers. +* In Retriever threads, do not catch Throwable. Catch and react to the Exception if there's a good reactive/corrective +behavior to apply, otherwise allow them to pass up the stack. Retriever threads should have an uncaught +Exception handler specified for the thread. The method should log the Exception or Throwable and then return. +* Private and protected methods whose calling client can't be trusted validate their arguments and throw an +appropriate exception. +* The audience for exceptions is not primarily the user of the client program, but the application or WorldWind +developer. Throw exceptions that would let them know immediately that they're using faulty logic or data. + +### Logging + +* Logging using java.util.logging has the nice feature of capturing the class and method name at the site of the +logging call. That's why there is the common idiom of create message, log message, throw exception. Wrapping +these three actions in some utility method would lose the class and method-name feature, so don't do that. Don't +use any logging system other than that in the JRE. +* Log all exceptional conditions before rethrowing or throwing a new exception. +* Ensure all logging uses i18n messages as detailed below. +* Use level SEVERE for things that prevent the intended action,e.g., file can't be written. Use level WARN for +things that don't stop the action but seem exceptional, e.g., a file was retrieved or written redundantly. Use +level FINE for simple notifications. Use FINER for method traces. Using the "FINE"series prevents screen display +of these when the default Java logging settings are used. Since we're a component, we don't communicate such +things directly to the application's user; the application does. + +### Concurrency + +* Use collection classes from the java.util.concurrent package if there's any chance at all that the collection +may be accessed from multiple threads. +* Except for simple atomic variables (but not long or double) the safest way to manage multi-thread access is +through the blocking queue classes of java.util.concurrent. +* Making a class' fields final avoids concurrency problems, but it makes the class much less extensible. If using +private, make sure there are overridable set/get accessors. + +### Offline Mode + +* WorldWind's use of the network can be disabled by calling {@link gov.nasa.WorldWind.setOfflineMode}. Prior to +attempting retrieval of a network resource -- anything addressed by a URL -- WorldWind checks the offline-mode +setting and does not attempt retrieval if the value is true. To honor this contract, all code must check network +status prior to attempting retrieval of a resource on the network. + +### Documentation + +* Use the appropriate Ant target to generate worldwind.jar and javadoc API documentation. Do not use the NetBeans +Tools command because it's not configured appropriately, only the Ant targets are. +* All public and protected classes, methods and fields should be commented for javadoc documentation generation. +* Descriptions of classes, methods, etc. should start with a capital letter. Parameter descriptions and +return-value description should start with a lower-case letter. All descriptions end with a period. +* If a class overrides methods from {@link Object} such as toString() and equals(), +their behavior for the specific class should be described. For equals() that would be the fields +compared. For toString() that would be the representation returned. +* Use links liberally, e.g., {@link WorldWind}. They help the reader get to information fast. + +### Code Formatting + +* Use the code formatting and style that's in the NetBeans project file. It makes it possible to review previous code +modifications. +* We generally use the traditional Java coding conventions. Constants are in all upper case with words separated by +underscores. Everything else is in camel case. Class names start with an upper case character, variables start +in lower case. +* White space is preferred over packing code into a small space. Please use white space liberally. +* Resolve all NetBeans warnings before checking in a file. If the warning refers to an intentional case, add an +exception statement. + +### Internationalization (i18n) + +* String "constants" are stored in separate resource files (e.g. MessageStrings.properties). These files must end +in ".properties" and must be stored in the src directory. Strings are stored with the format:  +packageOfClass.className.nameOfString=value of the string +* Access the string constants by using the following pattern:  (e.g. Logging.getMessage("myPackage.myClass.targetStringName");). + +### Books + +The books we go back to again and again are the following: +* *Core Java*, Horstmann & Cornell, Volumes 1 and 2, Prentice Hall. Be sure to get the editions covering at +least J2SE 5. Get the newest edition (currently 8). +* *The Java Programming Language*, Arnold & Gosling, Addison Wesley. Be sure to get the most recent edition +covering at least Java 6. +* *Concurrent Programming in Java*, Lea, Addison Wesley +* *Java Threads*, Oaks & Wong, O'Reilly +* *Java Cookbook*, Darwin, O'Reilly +* *OpenGL Programming Guide*, Shreiner & Woo & et al, Addison Wesley. Be sure to get the version covering +OpenGL 2.0, which is currently the Fifth Edition. +* *Mathematics for 3D Game Programming & Computer Graphics*, Lengyel, Charles River Media. Be sure to get the +Second (or later if there is one) edition. + +## Contributing + +### Reporting Bugs + +This section guides you through submitting a bug report to WorldWind Java. Following these guidelines helps both the +WorldWind team and community understand your report, reproduce the behavior, and find related reports. + +#### Before Submitting a Bug Report + +* Check this repository's [**issues**](https://github.com/NASAWorldWind/WorldWindJava/issues) to see if the problem has +already been reported. If it has and the issue is **still open**, add a comment to the existing issue instead of opening +a new one. + +> **Note:** If you find a **Closed** issue that seems like it is similar to what you are experiencing, open a new issue +and include a link to the original issue in the body of your new one. + +#### Submitting a Good Bug Report + +Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). After you've complete the prerequisites +for submitting a bug, create an issue in the appropriate repository and providing the following information by filling out +the [template](ISSUE_TEMPLATE.md). + +Explain the problem and include additional details to help the WorldWind team reproduce the problem: + +* **Use a clear, descriptive title.** +* **Describe the exact steps which reproduce the problem.** Please be as detailed as possible. When listing steps, don't +just say what you did, but explain how you did it. +* **Provide specific examples.** Include the appropriate files, links, or code snippets which will help the WorldWind +team and community better understand the issue. +* **Describe the behavior.** Detail what behavior you observed and point out what is wrong with that behavior. Explain +which behavior you expected to see and why. + +Provide more context by answering these questions: + +* **Did the problem start happening recently?** +* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which +conditions it normally happens. +* **Does the problem happen for all files, or only some?** +* **What is the name and version of the OS you're running?** + +### Suggesting New Features + +This section guides you through submitting and enhancement for WorldWind Java, including completely new features and minor +improvements to existing functionalities. Following these guidelines helps the WorldWind team and community understand +your suggestion and find related suggestions. + +Before creating new feature suggestions, check this repository's [issues](https://github.com/NASAWorldWind/WorldWindJava/issues) +as you may find out that you don't need to create one. When you are creating an enhancement suggestion, please provide as many details as possible. Fill in the [template](ISSUE_TEMPLATE.md), including the steps that you imagine you would take if the feature you're requesting existed. + +#### Submitting a Good New Feature Suggestion + +New feature suggestions are tracked as [GitHub Issues](https://guides.github.com/features/issues/). After you've checked for existing issues that might relate to your suggestion, create an issue +in the appropriate repository and provide the following information: + +* **Use a clear and descriptive title.** +* **Provide a step-by-step description of the suggested enhancement** in as many details as possible. +* **Provide specific examples to demonstrate the steps.** +* **Explain why this enhancement would be beneficial** to most WorldWind users. +* **Specify the name and version of the OS you're using.** + +### Pull Requests + +* Fill in the [PULL_REQUEST template](PULL_REQUEST_TEMPLATE.md). +* Do not include issue numbers in the PR title. +* Provide a description of the change. +* Explain why this code should be in the core. +* Describe possible benefits and drawbacks from merging this pull request. +* Specify some issues to which this pull request is applicable. + +## Resources + +For WorldWind Java tutorials and examples, please check out our website: https://worldwind.arc.nasa.gov/. + +To reach our Administrative Contact, please email: [Administrative Contact](mailto:worldwind-info@lists.nasa.gov) + diff --git a/Design and Coding Guidelines.html b/Design and Coding Guidelines.html index 75fe61a181..7322401b0a 100644 --- a/Design and Coding Guidelines.html +++ b/Design and Coding Guidelines.html @@ -1,12 +1,35 @@ - +Copyright 2006-2009, 2017, 2020 United States Government, as represented by the +Administrator of the National Aeronautics and Space Administration. +All rights reserved. + +The NASA World Wind Java (WWJ) platform is licensed under the Apache License, +Version 2.0 (the "License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +NASA World Wind Java (WWJ) also contains the following 3rd party Open Source +software: + + Jackson Parser – Licensed under Apache 2.0 + GDAL – Licensed under MIT + JOGL – Licensed under Berkeley Software Distribution (BSD) + Gluegen – Licensed under Berkeley Software Distribution (BSD) + +A complete listing of 3rd Party software notices and licenses included in +NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party +notices and licenses PDF found in code directory. + +--> + -

World Wind Multi-Platform Design and Coding Guidelines

+

WorldWind Multi-Platform Design and Coding Guidelines

General

    @@ -15,13 +38,13 @@

    General

    and all products must run on all those systems.
  • - Read the World Wind API's Overview section for a description of World Wind architecture, design and usage. Read - the overview pages of each World Wind package for descriptions of those. These descriptions contain critical - information that is not repeated elsewhere. To avoid making mistakes, everyone working on World Wind must read + Read the WorldWind API's Overview section for a description of WorldWind architecture, design and usage. Read + the overview pages of each WorldWind package for descriptions of those. These descriptions contain critical + information that is not repeated elsewhere. To avoid making mistakes, everyone working on WorldWind must read them before using or modifying the code.
  • - The project's development IDE is IntelliJ IDEA. The IDEA configuration files for this project are checked in to + The project's development IDE is Apache NetBeans. The NetBeans configuration files for this project are checked in to the code repository. They define within them global and local library links, formatting rules, etc.
  • @@ -76,11 +99,11 @@

    General

    and when it fails.
  • - World Wind never crashes. Always catch exceptions at least at the highest entry point from the runtime, e.g., UI + WorldWind never crashes. Always catch exceptions at least at the highest entry point from the runtime, e.g., UI listeners, thread run() methods.
  • - Within a rendering pass World Wind does not touch the disk or the network. Always fork off a thread to do that. + Within a rendering pass WorldWind does not touch the disk or the network. Always fork off a thread to do that. Use the TaskManager and Retriever systems to start threads during rendering. These are set up to govern thread usage to avoid swamping the local machine and the server.
  • @@ -124,7 +147,7 @@

    Exceptions

    appropriate exception.
  • - The audience for exceptions is not primarily the user of the client program, but the application or World Wind + The audience for exceptions is not primarily the user of the client program, but the application or WorldWind developer. Throw exceptions that would let them know immediately that they're using faulty logic or data.
@@ -170,8 +193,8 @@

Concurrency

Offline Mode

-

World Wind's use of the network can be disabled by calling {@link gov.nasa.WorldWind.setOfflineMode}. Prior to - attempting retrieval of a network resource -- anything addressed by a URL -- World Wind checks the offline-mode +

WorldWind's use of the network can be disabled by calling {@link gov.nasa.WorldWind.setOfflineMode}. Prior to + attempting retrieval of a network resource -- anything addressed by a URL -- WorldWind checks the offline-mode setting and does not attempt retrieval if the value is true. To honor this contract, all code must check network status prior to attempting retrieval of a resource on the network.

@@ -201,7 +224,7 @@

Documentation

Code Formatting

- *

+ *

* * @param configSource the configuration source. See above for supported types. * @param params key-value parameters to override or supplement the information provided in the specified diff --git a/src/gov/nasa/worldwind/BasicModel.java b/src/gov/nasa/worldwind/BasicModel.java index c744f5cf08..52d6a618fd 100644 --- a/src/gov/nasa/worldwind/BasicModel.java +++ b/src/gov/nasa/worldwind/BasicModel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -102,6 +124,7 @@ protected LayerList createLayersFromElement(Element element) * * @deprecated Use {@link #createLayersFromElement(org.w3c.dom.Element)} instead. */ + @Deprecated protected LayerList createLayersFromProperties(String layerNames) { LayerList layers = new LayerList(); @@ -244,7 +267,7 @@ public Extent getExtent() /** * {@inheritDoc} - *

+ *

* This implementation forwards the message each layer in the model. * * @param msg The message that was received. diff --git a/src/gov/nasa/worldwind/BasicSceneController.java b/src/gov/nasa/worldwind/BasicSceneController.java index fffeeb960a..1ad3e5a4a0 100644 --- a/src/gov/nasa/worldwind/BasicSceneController.java +++ b/src/gov/nasa/worldwind/BasicSceneController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Configuration.java b/src/gov/nasa/worldwind/Configuration.java index 654d3c034f..694ba93b18 100644 --- a/src/gov/nasa/worldwind/Configuration.java +++ b/src/gov/nasa/worldwind/Configuration.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -11,50 +33,50 @@ import gov.nasa.worldwind.util.*; import org.w3c.dom.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.xml.xpath.*; import java.io.*; import java.util.*; import java.util.logging.Level; /** - * This class manages the initial World Wind configuration. It reads World Wind configuration files and registers their + * This class manages the initial WorldWind configuration. It reads WorldWind configuration files and registers their * contents. Configurations files contain the names of classes to create at run-time, the initial model definition, * including the globe, elevation model and layers, and various control quantities such as cache sizes and data * retrieval timeouts. - *

+ *

* The Configuration class is a singleton, but its instance is not exposed publicly. It is addressed only via static * methods of the class. It is constructed upon first use of any of its static methods. - *

+ *

* When the Configuration class is first instantiated it reads the XML document config/worldwind.xml and * registers all the information there. The information can subsequently be retrieved via the class' various - * getValue methods. Many World Wind start-up objects query this information to determine the classes to - * create. For example, the first World Wind object created by an application is typically a {@link - * gov.nasa.worldwind.awt.WorldWindowGLCanvas}. During construction that class causes World Wind's internal classes to + * getValue methods. Many WorldWind start-up objects query this information to determine the classes to + * create. For example, the first WorldWind object created by an application is typically a {@link + * gov.nasa.worldwind.awt.WorldWindowGLCanvas}. During construction that class causes WorldWind's internal classes to * be constructed, using the names of those classes drawn from the Configuration singleton, this class. - *

- * The default World Wind configuration document is config/worldwind.xml. This can be changed by setting + *

+ * The default WorldWind configuration document is config/worldwind.xml. This can be changed by setting * the Java property gov.nasa.worldwind.config.file to a different file name or a valid URL prior to - * creating any World Wind object or invoking any static methods of World Wind classes, including the Configuration + * creating any WorldWind object or invoking any static methods of WorldWind classes, including the Configuration * class. When an application specifies a different configuration location it typically does so in its main method prior - * to using World Wind. If a file is specified its location must be on the classpath. (The contents of application and - * World Wind jar files are typically on the classpath, in which case the configuration file may be in the jar file.) - *

+ * to using WorldWind. If a file is specified its location must be on the classpath. (The contents of application and + * WorldWind jar files are typically on the classpath, in which case the configuration file may be in the jar file.) + *

* Additionally, an application may set another Java property, gov.nasa.worldwind.app.config.document, to a * file name or URL whose contents contain configuration values to override those of the primary configuration document. - * World Wind overrides only those values in this application document, it leaves all others to the value specified in + * WorldWind overrides only those values in this application document, it leaves all others to the value specified in * the primary document. Applications usually specify an override document in order to specify the initial layers in the * model. - *

+ *

* See config/worldwind.xml for documentation on setting configuration values. - *

+ *

* Configuration values can also be set programatically via {@link Configuration#setValue(String, Object)}, but they are * not retroactive so affect only Configuration queries made subsequent to setting the value. - *

+ *

* Note: Prior to September of 2009, configuration properties were read from the file * config/worldwind.properties. An alternate file could be specified via the * gov.nasa.worldwind.config.file Java property. These mechanisms remain available but are deprecated. - * World Wind no longer contains a worldwind.properties file. If worldwind.properties or its + * WorldWind no longer contains a worldwind.properties file. If worldwind.properties or its * replacement as specified through the Java property exists at run-time and can be found via the classpath, * configuration values specified by that mechanism are given precedence over values specified by the new mechanism. * @@ -381,7 +403,7 @@ public static synchronized Double getDoubleValue(String key) /** * Return as a Boolean the value associated with a specified key. - *

+ *

* Valid values for true are '1' or anything that starts with 't' or 'T'. ie. 'true', 'True', 't' Valid values for * false are '0' or anything that starts with 'f' or 'F'. ie. 'false', 'False', 'f' * @@ -399,7 +421,7 @@ public static synchronized Boolean getBooleanValue(String key, Boolean defaultVa /** * Return as a Boolean the value associated with a specified key. - *

+ *

* Valid values for true are '1' or anything that starts with 't' or 'T'. ie. 'true', 'True', 't' Valid values for * false are '0' or anything that starts with 'f' or 'F'. ie. 'false', 'False', 'f' * @@ -502,8 +524,8 @@ public static String getSystemTempDirectory() * Returns the path to the current user's application data directory. The path returned depends on the operating * system on which the Java Virtual Machine is running. The following table provides the path for all supported * operating systems: - *

- *
Operating SystemPath
Mac OS X~/Library/Application + * + *
Mapping
Operating SystemPath
Mac OS X~/Library/Application * Support
Windows~\\Application Data
Linux, Unix, * Solaris~/
* @@ -608,7 +630,7 @@ public static boolean isLinuxOS() public static boolean isUnixOS() { String osName = System.getProperty("os.name"); - return osName != null && osName.toLowerCase().contains("unix"); + return osName != null && (osName.toLowerCase().contains("linux") || osName.toLowerCase().contains("unix")); } /** @@ -644,10 +666,9 @@ public static float getJavaVersion() } /** - * Returns the highest OpenGL profile available on the current graphics device that is compatible with World Wind. + * Returns the highest OpenGL profile available on the current graphics device that is compatible with WorldWind. * The returned profile favors hardware acceleration over software acceleration. With JOGL version 2.0, this returns * the highest available profile from the following list: - *

*

  • OpenGL compatibility profile 4.x
  • OpenGL compatibility profile 3.x
  • OpenGL profile 1.x * up to 3.0
* @@ -659,7 +680,7 @@ public static GLProfile getMaxCompatibleGLProfile() } /** - * Returns a {@link javax.media.opengl.GLCapabilities} identifying graphics features required by World Wind. The + * Returns a {@link com.jogamp.opengl.GLCapabilities} identifying graphics features required by WorldWind. The * capabilities instance returned requests the maximum OpenGL profile supporting GL fixed function operations, a * frame buffer with 8 bits each of red, green, blue and alpha, a 24-bit depth buffer, double buffering, and if the * Java property "gov.nasa.worldwind.stereo.mode" is set to "device", device supported stereo. diff --git a/src/gov/nasa/worldwind/Disposable.java b/src/gov/nasa/worldwind/Disposable.java index 276ef2d47c..574caf5205 100644 --- a/src/gov/nasa/worldwind/Disposable.java +++ b/src/gov/nasa/worldwind/Disposable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Exportable.java b/src/gov/nasa/worldwind/Exportable.java index f732b65290..51c0bfb5a1 100644 --- a/src/gov/nasa/worldwind/Exportable.java +++ b/src/gov/nasa/worldwind/Exportable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -12,13 +34,11 @@ * Exportable marks an object that can be exported in different data formats. Implementing classes may support one or * more export formats. Formats are identified by MIME type. Call {@link #isExportFormatSupported(String)} to determine * if an object supports export in a certain format. - *

+ *

* Example of use: - *

*

  * // Export a PointPlacemark in KML format
  * PointPlacemark placemark;
- * 

* StringWriter kml = new StringWriter(); * placemark.export(KMLConstants.KML_MIME_TYPE, kml); *

diff --git a/src/gov/nasa/worldwind/Factory.java b/src/gov/nasa/worldwind/Factory.java index 20f5aa4c74..b4743702e8 100644 --- a/src/gov/nasa/worldwind/Factory.java +++ b/src/gov/nasa/worldwind/Factory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Locatable.java b/src/gov/nasa/worldwind/Locatable.java index 0c671c4ef6..682d50d465 100644 --- a/src/gov/nasa/worldwind/Locatable.java +++ b/src/gov/nasa/worldwind/Locatable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Model.java b/src/gov/nasa/worldwind/Model.java index 8273931c6e..7b2e8159cc 100644 --- a/src/gov/nasa/worldwind/Model.java +++ b/src/gov/nasa/worldwind/Model.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Movable.java b/src/gov/nasa/worldwind/Movable.java index 5109fb1201..c497c34bdc 100644 --- a/src/gov/nasa/worldwind/Movable.java +++ b/src/gov/nasa/worldwind/Movable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Movable2.java b/src/gov/nasa/worldwind/Movable2.java index b1d7fb4deb..41f57681c3 100644 --- a/src/gov/nasa/worldwind/Movable2.java +++ b/src/gov/nasa/worldwind/Movable2.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/Restorable.java b/src/gov/nasa/worldwind/Restorable.java index ea3d0c9eb5..c06789db67 100644 --- a/src/gov/nasa/worldwind/Restorable.java +++ b/src/gov/nasa/worldwind/Restorable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/SceneController.java b/src/gov/nasa/worldwind/SceneController.java index 72d7efa8c8..2cbf20ee7b 100644 --- a/src/gov/nasa/worldwind/SceneController.java +++ b/src/gov/nasa/worldwind/SceneController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -109,7 +131,7 @@ public interface SceneController extends WWObject, Disposable * Specifies the current pick point in AWT screen coordinates, or null to indicate that there is no * pick point. Each frame, this scene controller determines which objects are drawn at the pick point and places * them in a PickedObjectList. This list can be accessed by calling {@link #getPickedObjectList()}. - *

+ *

* If the pick point is null, this scene controller ignores the pick point and the list of objects * returned by getPickedObjectList is empty. * @@ -130,7 +152,7 @@ public interface SceneController extends WWObject, Disposable * Specifies the current pick rectangle in AWT screen coordinates, or null to indicate that there is no * pick rectangle. Each frame, this scene controller determines which objects intersect the pick rectangle and * places them in a PickedObjectList. This list can be accessed by calling {@link #getObjectsInPickRectangle()}. - *

+ *

* If the pick rectangle is null, this scene controller ignores the pick rectangle and the list of * objects returned by getObjectsInPickRectangle is empty. * diff --git a/src/gov/nasa/worldwind/StereoOptionSceneController.java b/src/gov/nasa/worldwind/StereoOptionSceneController.java index aabc28e2b8..9242ac00d3 100644 --- a/src/gov/nasa/worldwind/StereoOptionSceneController.java +++ b/src/gov/nasa/worldwind/StereoOptionSceneController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -10,23 +32,22 @@ import gov.nasa.worldwind.geom.Angle; import gov.nasa.worldwind.render.DrawContext; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** * TODO: This file needs to be updated to implement "correct" stereo, as described at: * http://www.orthostereo.com/geometryopengl.html - *

- *

+ *

* This scene controller draws in stereo, either red-blue anaglyph or device supported if the display device provides * stereo directly. It can also draw without applying stereo. To select stereo, prior to calling this class' constructor * set the Java VM property gov.nasa.worldwind.stereo.mode to "device" for device supported stereo (if * provided by the device) or "redblue" for red-blue anaglyph stereo. If the property is not set or is any other value, * this class does not draw in stereo. - *

+ *

* The {@link WorldWindow} instance must support stereo in order to use device-supported stereo. A stereo * WorldWindow is selected by specifying the Java VM property described above prior to creating it. See * {@link gov.nasa.worldwind.awt.WorldWindowGLCanvas} for further details. - *

+ *

* Note: The logic and much of the code here was contributed by Xander Enzmann of Mitre Corporation. * * @author tag @@ -35,7 +56,7 @@ public class StereoOptionSceneController extends BasicSceneController implements StereoSceneController { /** - * The default focus angle. May be specified in the World Wind configuration file as the + * The default focus angle. May be specified in the WorldWind configuration file as the * gov.nasa.worldwind.StereoFocusAngle property. The default if not specified in the configuration is * 1.6 degrees. */ @@ -114,7 +135,7 @@ public boolean isHardwareStereo() /** * {@inheritDoc} - *

+ *

* If the display device is providing stereo -- {@link #isHardwareStereo()} is true -- this method * returns true even if the stereo mode is {@link AVKey#STEREO_MODE_NONE}. In this case, individual stereo images * are drawn for left and right eyes in order to prevent a blurred scene. @@ -158,7 +179,7 @@ else if (AVKey.STEREO_MODE_RED_BLUE.equals(this.stereoMode) && pitchInRange) /** * Implement no stereo ("Mono") while using a stereo device. - *

+ *

* Note that this method draws the image twice, once to each of the left and right eye buffers, even when stereo is * not in effect. This is to prevent the stereo device from drawing blurred scenes. * diff --git a/src/gov/nasa/worldwind/StereoSceneController.java b/src/gov/nasa/worldwind/StereoSceneController.java index 33351f4838..dc105bc6c0 100644 --- a/src/gov/nasa/worldwind/StereoSceneController.java +++ b/src/gov/nasa/worldwind/StereoSceneController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -10,7 +32,7 @@ /** * An interface for scene controllers that provide stereo. - *

+ *

* Note: The {@link WorldWindow} instance must support stereo display in order to use device-supported stereo. See * {@link gov.nasa.worldwind.awt.WorldWindowGLCanvas} to learn how to select a stereo device. * @@ -24,10 +46,10 @@ public interface StereoSceneController extends SceneController * gov.nasa.worldwind.avlist.AVKey#STEREO_MODE_DEVICE} to request device supported stereo, {@link * gov.nasa.worldwind.avlist.AVKey#STEREO_MODE_RED_BLUE} to request red-blue anaglyph stereo implemented in * software, or {@link gov.nasa.worldwind.avlist.AVKey#STEREO_MODE_NONE} (the default) to request no stereo effect. - *

+ *

* If STEREO_MODE_DEVICE is requested but the display device does not support stereo, stereo is not * applied. - *

+ *

* See the implementing class to determine how it detects the initial stereo mode. * * @param mode the technique used to provide the stereo effect. If null, the mode is set to {@link diff --git a/src/gov/nasa/worldwind/Version.java b/src/gov/nasa/worldwind/Version.java index 9f588792a5..9a1a4e7bd0 100644 --- a/src/gov/nasa/worldwind/Version.java +++ b/src/gov/nasa/worldwind/Version.java @@ -1,50 +1,65 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwind; /** * @author tag * @version $Id: Version.java 1171 2013-02-11 21:45:02Z dcollins $ */ -public class Version -{ +public class Version { + private static final String MAJOR_VALUE = "2"; - private static final String MINOR_VALUE = "1"; + private static final String MINOR_VALUE = "2"; private static final String DOT_VALUE = "0"; private static final String versionNumber = "v" + MAJOR_VALUE + "." + MINOR_VALUE + "." + DOT_VALUE; - private static final String versionName = "NASA World Wind Java"; + private static final String versionName = "NASA WorldWind Java"; - public static String getVersion() - { + public static String getVersion() { return versionName + " " + versionNumber; } - public static String getVersionName() - { + public static String getVersionName() { return versionName; } - public static String getVersionNumber() - { + public static String getVersionNumber() { return versionNumber; } - public static String getVersionMajorNumber() - { + public static String getVersionMajorNumber() { return MAJOR_VALUE; } - public static String getVersionMinorNumber() - { + public static String getVersionMinorNumber() { return MINOR_VALUE; } - public static String getVersionDotNumber() - { + public static String getVersionDotNumber() { return DOT_VALUE; } } diff --git a/src/gov/nasa/worldwind/View.java b/src/gov/nasa/worldwind/View.java index 55febe104c..eb12663444 100644 --- a/src/gov/nasa/worldwind/View.java +++ b/src/gov/nasa/worldwind/View.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -18,19 +40,19 @@ * follows the OpenGL convention of a right-handed coordinate system with the origin at the eye point and looking down * the negative Z axis. View also provides a transformation from eye coordinates to screen coordinates, * following the OpenGL convention of an origin in the lower left hand screen corner. - *

+ *

* Most of the accessor and computation methods on View will use viewing state computed in the last call to * {@link #apply(gov.nasa.worldwind.render.DrawContext) apply}. - *

- * The following methods return state values updated in the most recent call to apply.

    + *

    + * The following methods return state values updated in the most recent call to apply.

      *
    • getEyePosition
    • getEyePoint
    • getUpVector
    • getForwardVector
    • *
    • getModelviewMatrix
    • getViewport
    • getFrustum
    • getFrustumInModelCoordinates
    • - *
    • getProjectionMatrix
    - *

    + *

  • getProjectionMatrix
+ *

* The following methods return computed values using state that was updated in the most recent call to - * apply.

  • project
  • unproject
  • computeRayFromScreenPoint
  • + * apply.
    • project
    • unproject
    • computeRayFromScreenPoint
    • *
    • computePositionFromScreenPoint
    • computePixelSizeAtDistance
    • computeHorizonDistance
    - *
    + * * * @author Paul Collins * @version $Id: View.java 1171 2013-02-11 21:45:02Z dcollins $ @@ -47,7 +69,7 @@ public interface View extends WWObject, Restorable /** * Returns the current geographic coordinates of this view's eye position, as computed for the most recent model * traversal. - *

    + *

    * Note: The value returned is not necessarily the value specified to {@link #setEyePosition(gov.nasa.worldwind.geom.Position)} * but is the eye position corresponding to this view's most recently applied state. * @@ -68,7 +90,7 @@ public interface View extends WWObject, Restorable /** * Returns the current geographic coordinates of this view's eye position, as determined from this view's current * parameters. - *

    + *

    * Note: The value returned is not necessarily the value specified to {@link #setEyePosition(gov.nasa.worldwind.geom.Position)} * but is the eye position corresponding to this view's current parameters. * @@ -262,7 +284,7 @@ public interface View extends WWObject, Restorable * reflects the values of this view, as do any computed values of the view, such as the modelview matrix, projection * matrix and viewing frustum. * - * @param dc the current World Wind DrawContext on which View will apply its state. + * @param dc the current WorldWind DrawContext on which View will apply its state. * * @throws IllegalArgumentException If dc is null, or if the Globe or GL * instances in dc are null. @@ -303,7 +325,7 @@ public interface View extends WWObject, Restorable * popReferenceCenter} after rendering is complete. Note that calls to {@link #getModelviewMatrix} will not return * reference-center model-view matrix, but the original matrix. * - * @param dc the current World Wind drawing context on which new model-view state will be applied. + * @param dc the current WorldWind drawing context on which new model-view state will be applied. * @param referenceCenter the location to become the new world origin. * * @return a new model-view matrix with origin is at referenceCenter, or null if this method failed. @@ -316,7 +338,7 @@ public interface View extends WWObject, Restorable /** * Removes the model-view matrix on top of the matrix stack, and restores the original matrix. * - * @param dc the current World Wind drawing context on which the original matrix will be restored. + * @param dc the current WorldWind drawing context on which the original matrix will be restored. * * @throws IllegalArgumentException if dc is null, or if the Globe or GL * instances in dc are null. diff --git a/src/gov/nasa/worldwind/WWObject.java b/src/gov/nasa/worldwind/WWObject.java index 5bae0643b3..18def1dfe6 100644 --- a/src/gov/nasa/worldwind/WWObject.java +++ b/src/gov/nasa/worldwind/WWObject.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.event.MessageListener; /** - * An interface provided by the major World Wind components to provide attribute-value list management and + * An interface provided by the major WorldWind components to provide attribute-value list management and * property change management. Classifies implementers as property-change listeners, allowing them to receive * property-change events. * diff --git a/src/gov/nasa/worldwind/WWObjectImpl.java b/src/gov/nasa/worldwind/WWObjectImpl.java index eb70be95e2..12b26838a4 100644 --- a/src/gov/nasa/worldwind/WWObjectImpl.java +++ b/src/gov/nasa/worldwind/WWObjectImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; diff --git a/src/gov/nasa/worldwind/WorldWind.java b/src/gov/nasa/worldwind/WorldWind.java index b6e4f1919b..d4ca1cd3c7 100644 --- a/src/gov/nasa/worldwind/WorldWind.java +++ b/src/gov/nasa/worldwind/WorldWind.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -14,7 +36,7 @@ import gov.nasa.worldwind.util.*; import javax.imageio.spi.IIORegistry; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL; import java.beans.PropertyChangeListener; import java.util.logging.Level; @@ -94,16 +116,16 @@ private void dispose() } /** - * Reinitialize World Wind to its initial ready state. Shut down and restart all World Wind services and clear all - * World Wind memory caches. Cache memory will be released at the next JVM garbage collection. - *

    - * Call this method to reduce World Wind's current resource usage to its initial, empty state. - *

    + * Reinitialize WorldWind to its initial ready state. Shut down and restart all WorldWind services and clear all + * WorldWind memory caches. Cache memory will be released at the next JVM garbage collection. + *

    + * Call this method to reduce WorldWind's current resource usage to its initial, empty state. + *

    * The state of any open {@link WorldWindow} objects is indeterminate subsequent to invocation of this method. The * core WorldWindow objects attempt to shut themselves down cleanly during the call, but their resulting window * state is undefined. - *

    - * World Wind can continue to be used after calling this method. + *

    + * WorldWind can continue to be used after calling this method. */ public static synchronized void shutDown() { @@ -169,9 +191,9 @@ public static SessionCache getSessionCache() } /** - * Indicates whether World Wind will attempt to connect to the network to retrieve data or for other reasons. + * Indicates whether WorldWind will attempt to connect to the network to retrieve data or for other reasons. * - * @return true if World Wind is in off-line mode, false if not. + * @return true if WorldWind is in off-line mode, false if not. * * @see NetworkStatus */ @@ -181,10 +203,10 @@ public static boolean isOfflineMode() } /** - * Indicate whether World Wind should attempt to connect to the network to retrieve data or for other reasons. The + * Indicate whether WorldWind should attempt to connect to the network to retrieve data or for other reasons. The * default value for this attribute is false, indicating that the network should be used. * - * @param offlineMode true if World Wind should use the network, false otherwise + * @param offlineMode true if WorldWind should use the network, false otherwise * * @see NetworkStatus */ @@ -211,8 +233,8 @@ public static Object createComponent(String className) throws WWRuntimeException try { - Class c = Class.forName(className.trim()); - return c.newInstance(); + Class c = Class.forName(className.trim()); + return c.getConstructor().newInstance(); } catch (Exception e) { @@ -232,7 +254,7 @@ public static Object createComponent(String className) throws WWRuntimeException * @return the new component * * @throws IllegalStateException if no name could be found which corresponds to classNameKey - * @throws IllegalArgumentException if classNameKey is null + * @throws IllegalArgumentException if classNameKey is null * @throws WWRuntimeException if the component could not be created */ public static Object createConfigurationComponent(String classNameKey) diff --git a/src/gov/nasa/worldwind/WorldWindow.java b/src/gov/nasa/worldwind/WorldWindow.java index 3273d40254..be4ebb3316 100644 --- a/src/gov/nasa/worldwind/WorldWindow.java +++ b/src/gov/nasa/worldwind/WorldWindow.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -13,11 +35,11 @@ import gov.nasa.worldwind.pick.PickedObjectList; import gov.nasa.worldwind.util.PerformanceStatistic; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GLContext; import java.util.*; /** - * The top-level interface common to all toolkit-specific World Wind windows. + * The top-level interface common to all toolkit-specific WorldWind windows. * * @author Tom Gaskins * @version $Id: WorldWindow.java 2047 2014-06-06 22:48:33Z tgaskins $ @@ -94,43 +116,43 @@ public interface WorldWindow extends AVList /** * Sets the input handler to use for this instance. * - * @param inputHandler The input handler to use for this world window. May by null if null - * is specified, the current input handler, if any, is disassociated with the world window. + * @param inputHandler The input handler to use for this WorldWindow. May by null if null + * is specified, the current input handler, if any, is disassociated with the WorldWindow. */ void setInputHandler(InputHandler inputHandler); /** - * Adds a rendering listener to this world window. Rendering listeners are called at key point during World Wind + * Adds a rendering listener to this WorldWindow. Rendering listeners are called at key point during WorldWind * drawing and provide applications the ability to participate or monitor rendering. * - * @param listener The rendering listener to add to those notified of rendering events by this world window. + * @param listener The rendering listener to add to those notified of rendering events by this WorldWindow. */ void addRenderingListener(RenderingListener listener); /** - * Removes a specified rendering listener associated with this world window. + * Removes a specified rendering listener associated with this WorldWindow. * * @param listener The rendering listener to remove. */ void removeRenderingListener(RenderingListener listener); /** - * Adds a select listener to this world window. Select listeners are called when a selection is made by the user in - * the world window. A selection is any operation that identifies a visible item. + * Adds a select listener to this WorldWindow. Select listeners are called when a selection is made by the user in + * the WorldWindow. A selection is any operation that identifies a visible item. * * @param listener The select listener to add. */ void addSelectListener(SelectListener listener); /** - * Removes the specified select listener associated with this world window. + * Removes the specified select listener associated with this WorldWindow. * * @param listener The select listener to remove. */ void removeSelectListener(SelectListener listener); /** - * Adds a position listener to this world window. Position listeners are called when the cursor's position changes. + * Adds a position listener to this WorldWindow. Position listeners are called when the cursor's position changes. * They identify the position of the cursor on the globe, or that the cursor is not on the globe. * * @param listener The position listener to add. @@ -138,21 +160,21 @@ public interface WorldWindow extends AVList void addPositionListener(PositionListener listener); /** - * Removes the specified position listener associated with this world window. + * Removes the specified position listener associated with this WorldWindow. * * @param listener The listener to remove. */ void removePositionListener(PositionListener listener); /** - * Causes a repaint event to be enqueued with the window system for this world window. The repaint will occur at the + * Causes a repaint event to be enqueued with the window system for this WorldWindow. The repaint will occur at the * window system's discretion, within the window system toolkit's event loop, and on the thread of that loop. This - * is the preferred method for requesting a repaint of the world window. + * is the preferred method for requesting a repaint of the WorldWindow. */ void redraw(); /** - * Immediately repaints the world window without waiting for a window system repaint event. This is not the + * Immediately repaints the WorldWindow without waiting for a window system repaint event. This is not the * preferred way to cause a repaint, but is provided for the rare cases that require it. */ void redrawNow(); @@ -166,8 +188,8 @@ public interface WorldWindow extends AVList Position getCurrentPosition(); /** - * Returns the World Wind objects at the current cursor position. The list of objects under the cursor is determined - * each time the world window is repainted. This method returns the list of objects determined when the most recent + * Returns the WorldWind objects at the current cursor position. The list of objects under the cursor is determined + * each time the WorldWindow is repainted. This method returns the list of objects determined when the most recent * repaint was performed. * * @return The list of objects at the cursor position, or null if no objects are under the cursor. @@ -175,8 +197,8 @@ public interface WorldWindow extends AVList PickedObjectList getObjectsAtCurrentPosition(); /** - * Returns the World Wind objects intersecting the current selection box. The list of objects in the selection box - * is determined each time the world window is repainted. This method returns the list of objects determined when + * Returns the WorldWind objects intersecting the current selection box. The list of objects in the selection box + * is determined each time the WorldWindow is repainted. This method returns the list of objects determined when * the most recent repaint was performed. * * @return The list of objects intersecting the selection box, or null if no objects are in the box. @@ -184,14 +206,14 @@ public interface WorldWindow extends AVList PickedObjectList getObjectsInSelectionBox(); /** - * Returns the GPU Resource used by this World Window. This method is for internal use only. - *

    + * Returns the GPU Resource used by this WorldWindow. This method is for internal use only. + *

    * Note: Applications do not need to interact with the GPU resource cache. It is self managed. Modifying it in any * way will cause significant problems such as excessive memory usage or application crashes. The only reason to use * the GPU resource cache is to request management of GPU resources within implementations of shapes or layers. And * then access should be only through the draw context only. * - * @return The GPU Resource cache used by this World Window. + * @return The GPU Resource cache used by this WorldWindow. */ GpuResourceCache getGpuResourceCache(); @@ -211,13 +233,13 @@ public interface WorldWindow extends AVList Collection getPerFrameStatistics(); // TODO: move the constants from AVKey to this interface. /** - * Causes resources used by the World Window to be freed. The World Window cannot be used once this method is + * Causes resources used by the WorldWindow to be freed. The WorldWindow cannot be used once this method is * called. */ void shutdown(); /** - * Adds an exception listener to this world window. Exception listeners are called when an exception or other + * Adds an exception listener to this WorldWindow. Exception listeners are called when an exception or other * critical event occurs during drawable initialization or during rendering. * * @param listener the The exception listener to add. @@ -225,7 +247,7 @@ public interface WorldWindow extends AVList void addRenderingExceptionListener(RenderingExceptionListener listener); /** - * Removes the specified rendering exception listener associated with this world window. + * Removes the specified rendering exception listener associated with this WorldWindow. * * @param listener The listener to remove. */ diff --git a/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java b/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java index 7628665d4d..8005c6871b 100644 --- a/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java +++ b/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; @@ -16,8 +38,8 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.util.dashboard.DashboardController; -import javax.media.opengl.*; -import javax.media.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; import javax.swing.*; import java.awt.*; import java.awt.event.*; @@ -27,7 +49,7 @@ /** * A non-platform specific {@link WorldWindow} class. This class can be aggregated into platform-specific classes to - * provide the core functionality of World Wind. + * provide the core functionality of WorldWind. * * @author Tom Gaskins * @version $Id: WorldWindowGLAutoDrawable.java 2047 2014-06-06 22:48:33Z tgaskins $ @@ -236,7 +258,7 @@ else if (this.enableGpuCacheReinitialization) // 1) As of November 2012, we cannot find any evidence that the GL_ARB_texture_non_power_of_two extension is // problematic on Mac OS X machines with ATI graphics cards. The texture rectangle extension is more limiting // than the NPOT extension, and therefore not preferred. - // 2) World Wind assumes that a texture's target is always GL_TEXTURE_2D, and therefore incorrectly displays + // 2) WorldWind assumes that a texture's target is always GL_TEXTURE_2D, and therefore incorrectly displays // textures with the target GL_TEXTURE_RECTANGLE. TextureIO.setTexRectEnabled(false); @@ -255,15 +277,14 @@ protected void reinitialize(GLAutoDrawable glAutoDrawable) /** * See {@link GLEventListener#init(GLAutoDrawable)}. - *

    + *

    * GLEventListener's dispose method indicates that the GL context has been released, and provides the listener an * opportunity to clean up any resources. Dispose does not imply that the component's lifecycle has ended or that * the application is closing. There are three cases in which dispose may be called: - *

    *

    • The WorldWindow is removed from its parent component.
    • The WorldWindow's parent frame is * closed.
    • The application calls either GLCanvas.dispose or GLJPanel.dispose.
    - *

    - * This implementation is left empty. In the case when a WorldWindow or a World Wind application has reached its end + *

    + * This implementation is left empty. In the case when a WorldWindow or a WorldWind application has reached its end * of life, its resources should be released by calling {@link gov.nasa.worldwind.WorldWindow#shutdown()} or {@link * gov.nasa.worldwind.WorldWind#shutDown()}, respectively. In the case when a WorldWindow is removed from its parent * frame or that frame is closed without a call to shutdown, it is assumed that the application intends to reuse the @@ -530,7 +551,7 @@ public void run() /** * {@inheritDoc} - *

    + *

    * Forward the message event to the Model for distribution to the layers. * * @param msg Message event. diff --git a/src/gov/nasa/worldwind/WorldWindowGLDrawable.java b/src/gov/nasa/worldwind/WorldWindowGLDrawable.java index dbaa048975..ce20776d7c 100644 --- a/src/gov/nasa/worldwind/WorldWindowGLDrawable.java +++ b/src/gov/nasa/worldwind/WorldWindowGLDrawable.java @@ -1,14 +1,36 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; import gov.nasa.worldwind.cache.*; -import javax.media.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLAutoDrawable; /** * @author tag diff --git a/src/gov/nasa/worldwind/WorldWindowImpl.java b/src/gov/nasa/worldwind/WorldWindowImpl.java index 64ce22ac13..51da668096 100644 --- a/src/gov/nasa/worldwind/WorldWindowImpl.java +++ b/src/gov/nasa/worldwind/WorldWindowImpl.java @@ -1,11 +1,34 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind; +import com.jogamp.nativewindow.ScalableSurface; import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.cache.*; import gov.nasa.worldwind.event.*; @@ -42,7 +65,7 @@ public WorldWindowImpl() } /** - * Causes resources used by the World Window to be freed. The World Window cannot be used once this method is + * Causes resources used by the WorldWindow to be freed. The WorldWindow cannot be used once this method is * called. An OpenGL context for the window must be current. */ public void shutdown() @@ -318,4 +341,32 @@ public static GpuResourceCache createGpuResourceCache() long cacheSize = Configuration.getLongValue(AVKey.TEXTURE_CACHE_SIZE, FALLBACK_TEXTURE_CACHE_SIZE); return new BasicGpuResourceCache((long) (0.8 * cacheSize), cacheSize); } + + /** + * Configures JOGL's surface pixel scaling on the specified + * ScalableSurface to ensure backward compatibility with + * WorldWind applications developed prior to JOGL pixel scaling's + * introduction.This method is used by GLCanvas and + * GLJPanel to effectively disable JOGL's surface pixel scaling + * by requesting a 1:1 scale.

    + * Since v2.2.0, JOGL defaults to using high-dpi pixel scales where + * possible. This causes WorldWind screen elements such as placemarks, the + * compass, the world map, the view controls, and the scale bar (plus many + * more) to appear smaller than they are intended to on screen. The high-dpi + * default also has the effect of degrading WorldWind rendering performance. + * + * @param surface The surface to configure. + */ + public static void configureIdentityPixelScale(ScalableSurface surface) + { + if (surface == null) + { + String message = Logging.getMessage("nullValue.SurfaceIsNull"); + Logging.logger().severe(message); + throw new IllegalArgumentException(message); + } + + float[] identityScale = new float[] {ScalableSurface.IDENTITY_PIXELSCALE, ScalableSurface.IDENTITY_PIXELSCALE}; + surface.setSurfaceScale(identityScale); + } } diff --git a/src/gov/nasa/worldwind/animation/AngleAnimator.java b/src/gov/nasa/worldwind/animation/AngleAnimator.java index 3125354726..cc75a3469e 100644 --- a/src/gov/nasa/worldwind/animation/AngleAnimator.java +++ b/src/gov/nasa/worldwind/animation/AngleAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/AnimationController.java b/src/gov/nasa/worldwind/animation/AnimationController.java index 5eef377394..7c3f90ac95 100644 --- a/src/gov/nasa/worldwind/animation/AnimationController.java +++ b/src/gov/nasa/worldwind/animation/AnimationController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/AnimationSupport.java b/src/gov/nasa/worldwind/animation/AnimationSupport.java index 541ba89eb8..db2e1341fb 100644 --- a/src/gov/nasa/worldwind/animation/AnimationSupport.java +++ b/src/gov/nasa/worldwind/animation/AnimationSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; @@ -80,7 +102,7 @@ public static long getScaledTimeMillisecs( * Calculate the angular ratio between two angles * @param x The numerator * @param y The denominator - * @return The angular ratio of x/y> + * @return The angular ratio of x/y */ public static double angularRatio(Angle x, Angle y) { diff --git a/src/gov/nasa/worldwind/animation/Animator.java b/src/gov/nasa/worldwind/animation/Animator.java index 389fea0400..009fd7ea4f 100644 --- a/src/gov/nasa/worldwind/animation/Animator.java +++ b/src/gov/nasa/worldwind/animation/Animator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/BasicAnimator.java b/src/gov/nasa/worldwind/animation/BasicAnimator.java index cff870e8a1..8b52d19a21 100644 --- a/src/gov/nasa/worldwind/animation/BasicAnimator.java +++ b/src/gov/nasa/worldwind/animation/BasicAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/CompoundAnimator.java b/src/gov/nasa/worldwind/animation/CompoundAnimator.java index ff6d8df5cc..56e7d289b2 100644 --- a/src/gov/nasa/worldwind/animation/CompoundAnimator.java +++ b/src/gov/nasa/worldwind/animation/CompoundAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/DoubleAnimator.java b/src/gov/nasa/worldwind/animation/DoubleAnimator.java index bb33a91405..b1bd1fea28 100644 --- a/src/gov/nasa/worldwind/animation/DoubleAnimator.java +++ b/src/gov/nasa/worldwind/animation/DoubleAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/Interpolator.java b/src/gov/nasa/worldwind/animation/Interpolator.java index d20b820004..96933f75af 100644 --- a/src/gov/nasa/worldwind/animation/Interpolator.java +++ b/src/gov/nasa/worldwind/animation/Interpolator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/MoveToDoubleAnimator.java b/src/gov/nasa/worldwind/animation/MoveToDoubleAnimator.java index 303f3d0d1a..68305c6b3a 100644 --- a/src/gov/nasa/worldwind/animation/MoveToDoubleAnimator.java +++ b/src/gov/nasa/worldwind/animation/MoveToDoubleAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/MoveToPositionAnimator.java b/src/gov/nasa/worldwind/animation/MoveToPositionAnimator.java index e86b1966ef..ae940bfbca 100644 --- a/src/gov/nasa/worldwind/animation/MoveToPositionAnimator.java +++ b/src/gov/nasa/worldwind/animation/MoveToPositionAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/PositionAnimator.java b/src/gov/nasa/worldwind/animation/PositionAnimator.java index 14645e7518..4ff0d7d927 100644 --- a/src/gov/nasa/worldwind/animation/PositionAnimator.java +++ b/src/gov/nasa/worldwind/animation/PositionAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/RotateToAngleAnimator.java b/src/gov/nasa/worldwind/animation/RotateToAngleAnimator.java index 28af521c68..8664b1bb8f 100644 --- a/src/gov/nasa/worldwind/animation/RotateToAngleAnimator.java +++ b/src/gov/nasa/worldwind/animation/RotateToAngleAnimator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/ScheduledInterpolator.java b/src/gov/nasa/worldwind/animation/ScheduledInterpolator.java index bd6fc666fd..47440649dd 100644 --- a/src/gov/nasa/worldwind/animation/ScheduledInterpolator.java +++ b/src/gov/nasa/worldwind/animation/ScheduledInterpolator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/animation/SmoothInterpolator.java b/src/gov/nasa/worldwind/animation/SmoothInterpolator.java index d6d9fbc499..70269c9d81 100644 --- a/src/gov/nasa/worldwind/animation/SmoothInterpolator.java +++ b/src/gov/nasa/worldwind/animation/SmoothInterpolator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.animation; diff --git a/src/gov/nasa/worldwind/avlist/AVKey.java b/src/gov/nasa/worldwind/avlist/AVKey.java index fc5e961fc5..996ced8451 100644 --- a/src/gov/nasa/worldwind/avlist/AVKey.java +++ b/src/gov/nasa/worldwind/avlist/AVKey.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.avlist; @@ -85,7 +107,7 @@ public interface AVKey // TODO: Eliminate unused constants, if any final String DATA_TYPE = "gov.nasa.worldwind.avkey.DataType"; final String DELETE_CACHE_ON_EXIT = "gov.nasa.worldwind.avkey.DeleteCacheOnExit"; /** - * Indicates the World Wind scene's worst-case depth resolution, in meters. This is typically interpreted by the + * Indicates the WorldWind scene's worst-case depth resolution, in meters. This is typically interpreted by the * View as the desired resolution at the scene's maximum drawing distance. In this case, the resolution closer to * the viewer's eye point is significantly better then the worst-case resolution. Decreasing this value enables the * viewer to get closer to 3D shapes positioned above the terrain at the coast of potential rendering artifacts @@ -296,7 +318,9 @@ public interface AVKey // TODO: Eliminate unused constants, if any final String PIXEL_FORMAT = "gov.nasa.worldwind.avkey.PixelFormat"; final String PIXEL_HEIGHT = "gov.nasa.worldwind.avkey.PixelHeight"; final String PIXEL_WIDTH = "gov.nasa.worldwind.avkey.PixelWidth"; + /** @deprecated Use {@link #DATA_TYPE} instead.. */ + @Deprecated final String PIXEL_TYPE = AVKey.DATA_TYPE; final String PLACENAME_LAYER_CACHE_SIZE = "gov.nasa.worldwind.avkey.PlacenameLayerCacheSize"; diff --git a/src/gov/nasa/worldwind/avlist/AVList.java b/src/gov/nasa/worldwind/avlist/AVList.java index ee7e189c30..1725f0c050 100644 --- a/src/gov/nasa/worldwind/avlist/AVList.java +++ b/src/gov/nasa/worldwind/avlist/AVList.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.avlist; diff --git a/src/gov/nasa/worldwind/avlist/AVListImpl.java b/src/gov/nasa/worldwind/avlist/AVListImpl.java index 7f05739e37..58743d62e8 100644 --- a/src/gov/nasa/worldwind/avlist/AVListImpl.java +++ b/src/gov/nasa/worldwind/avlist/AVListImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.avlist; @@ -16,7 +38,7 @@ * An implementation class for the {@link AVList} interface. Classes implementing AVList can subclass or * aggregate this class to provide default AVList functionality. This class maintains a hash table of * attribute-value pairs. - *

    + *

    * This class implements a notification mechanism for attribute-value changes. The mechanism provides a means for * objects to observe attribute changes or queries for certain keys without explicitly monitoring all keys. See {@link * java.beans.PropertyChangeSupport}. diff --git a/src/gov/nasa/worldwind/awt/AWTInputHandler.java b/src/gov/nasa/worldwind/awt/AWTInputHandler.java index 8c4f78a581..3697849cdc 100644 --- a/src/gov/nasa/worldwind/awt/AWTInputHandler.java +++ b/src/gov/nasa/worldwind/awt/AWTInputHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; @@ -11,7 +33,7 @@ import gov.nasa.worldwind.pick.*; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; import javax.swing.event.*; import java.awt.*; import java.awt.event.*; @@ -372,7 +394,7 @@ public void mousePressed(MouseEvent mouseEvent) } // Determine if the mouse point has changed since the last mouse move event. This can happen if user switches to - // another window, moves the mouse, and then switches back to the World Wind window. + // another window, moves the mouse, and then switches back to the WorldWind window. boolean mousePointChanged = !mouseEvent.getPoint().equals(this.mousePoint); this.mousePoint = mouseEvent.getPoint(); diff --git a/src/gov/nasa/worldwind/awt/AbstractViewInputHandler.java b/src/gov/nasa/worldwind/awt/AbstractViewInputHandler.java index 2451207d79..b0783cd1f4 100644 --- a/src/gov/nasa/worldwind/awt/AbstractViewInputHandler.java +++ b/src/gov/nasa/worldwind/awt/AbstractViewInputHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; @@ -657,7 +679,7 @@ protected void handleFocusLost(FocusEvent e) public void apply() { - // Process per-frame input only when the World Window is the focus owner. + // Process per-frame input only when the WorldWindow is the focus owner. if (!this.isWorldWindowFocusOwner()) { return; diff --git a/src/gov/nasa/worldwind/awt/BasicViewInputHandler.java b/src/gov/nasa/worldwind/awt/BasicViewInputHandler.java index 4661447e46..e7af6f0ca6 100644 --- a/src/gov/nasa/worldwind/awt/BasicViewInputHandler.java +++ b/src/gov/nasa/worldwind/awt/BasicViewInputHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; diff --git a/src/gov/nasa/worldwind/awt/KeyEventState.java b/src/gov/nasa/worldwind/awt/KeyEventState.java index 7d40108e49..3c886afd81 100644 --- a/src/gov/nasa/worldwind/awt/KeyEventState.java +++ b/src/gov/nasa/worldwind/awt/KeyEventState.java @@ -1,10 +1,33 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; +import gov.nasa.worldwind.util.Logging; import java.awt.event.*; import java.util.*; @@ -12,227 +35,221 @@ * @author dcollins * @version $Id: KeyEventState.java 2193 2014-08-01 23:33:16Z dcollins $ */ -public class KeyEventState implements KeyListener, MouseListener -{ - protected static class InputState - { +public class KeyEventState implements KeyListener, MouseListener { + + protected static class InputState { protected int eventType; protected int keyOrButtonCode; protected long timestamp; - public InputState(int eventType, int keyOrButtonCode, long timestamp) - { + public InputState(int eventType, int keyOrButtonCode, long timestamp) { this.eventType = eventType; this.keyOrButtonCode = keyOrButtonCode; this.timestamp = timestamp; } - public int getEventType() - { + public int getEventType() { return this.eventType; } - public int getKeyOrButtonCode() - { + public int getKeyOrButtonCode() { return this.keyOrButtonCode; } - public long getTimestamp() - { + public long getTimestamp() { return this.timestamp; } } - protected Map keyStateMap = new HashMap(); - protected int modifiers; + protected Map keyStateMap = new HashMap<>(); protected int modifiersEx; - protected int mouseModifiers; protected int mouseModifiersEx; - public KeyEventState() - { + public KeyEventState() { } - public boolean isKeyDown(int keyCode) - { + public boolean isKeyDown(int keyCode) { InputState state = this.getKeyState(keyCode); return state != null && state.getEventType() == KeyEvent.KEY_PRESSED; } - public int keyState(int keyCode) - { + public int keyState(int keyCode) { InputState state = this.getKeyState(keyCode); return state != null && state.getEventType() == KeyEvent.KEY_PRESSED ? 1 : 0; } - public int getNumKeysDown() - { - if (keyStateMap.isEmpty()) - { - return(0); + public int getNumKeysDown() { + if (keyStateMap.isEmpty()) { + return (0); } int numKeys = 0; - for (Object o : this.keyStateMap.keySet()) - { + for (Object o : this.keyStateMap.keySet()) { //Integer key = (KeyEvent) o; InputState is = this.keyStateMap.get(o); - if (is.getEventType() == KeyEvent.KEY_PRESSED) - { + if (is.getEventType() == KeyEvent.KEY_PRESSED) { numKeys++; } } - return(numKeys); + return (numKeys); } - public int getNumButtonsDown() - { - if (keyStateMap.isEmpty()) - { - return(0); + public int getNumButtonsDown() { + if (keyStateMap.isEmpty()) { + return (0); } int numKeys = 0; - for (Object o : this.keyStateMap.keySet()) - { - //Integer key = (KeyEvent) o; + for (Object o : this.keyStateMap.keySet()) { InputState is = this.keyStateMap.get(o); - if (is.getEventType() == MouseEvent.MOUSE_PRESSED) - { + if (is.getEventType() == MouseEvent.MOUSE_PRESSED) { numKeys++; } } - return(numKeys); + return (numKeys); } - public int getModifiers() - { - return this.modifiers; + /** + * @return The same value as {@link #getModifiersEx()}. + * @deprecated Use {@link #getModifiersEx()} instead + */ + @Deprecated + public int getModifiers() { + String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "getModifiers", "getModifiersEx"); + Logging.logger().severe(msg); + return this.modifiersEx; } - public int getModifiersEx() - { + /** + * @return The extended event modifiers. + */ + public int getModifiersEx() { return this.modifiersEx; } - public int getMouseModifiers() - { - return this.mouseModifiers; + /** + * @return The same value as {@link #getMouseModifiersEx()}. + * @deprecated Use {@link #getMouseModifiersEx()} instead + */ + @Deprecated + public int getMouseModifiers() { + String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "getMouseModifiers", "getMouseModifiersEx"); + Logging.logger().severe(msg); + return this.mouseModifiersEx; } - public int getMouseModifiersEx() - { + /** + * @return The extended mouse event modifiers. + */ + public int getMouseModifiersEx() { return this.mouseModifiersEx; } - public void clearKeyState() - { + public void clearKeyState() { this.keyStateMap.clear(); - this.modifiers = 0; this.modifiersEx = 0; - this.mouseModifiers = 0; this.mouseModifiersEx = 0; } - public void keyTyped(KeyEvent e) - { + @Override + public void keyTyped(KeyEvent e) { } - public void keyPressed(KeyEvent e) - { + @Override + public void keyPressed(KeyEvent e) { this.onKeyEvent(e, KeyEvent.KEY_PRESSED); } - public void keyReleased(KeyEvent e) - { + @Override + public void keyReleased(KeyEvent e) { this.removeKeyState(e); } - protected void onKeyEvent(KeyEvent e, int eventType) - { - if (e == null) + protected void onKeyEvent(KeyEvent e, int eventType) { + if (e == null) { return; + } long timestamp = this.getTimeStamp(e, eventType, this.keyStateMap.get(e.getKeyCode())); this.setKeyState(e.getKeyCode(), new InputState(eventType, e.getKeyCode(), timestamp)); - this.setModifiers(e.getModifiers()); this.setModifiersEx(e.getModifiersEx()); } - public void mouseClicked(java.awt.event.MouseEvent mouseEvent) - { + @Override + public void mouseClicked(java.awt.event.MouseEvent mouseEvent) { } - public void mousePressed(java.awt.event.MouseEvent e) - { + @Override + public void mousePressed(java.awt.event.MouseEvent e) { long timestamp = this.getTimeStamp(e, MouseEvent.MOUSE_PRESSED, this.keyStateMap.get(e.getModifiersEx())); this.setKeyState(e.getButton(), new InputState(MouseEvent.MOUSE_PRESSED, e.getButton(), timestamp)); - this.setMouseModifiers(e.getModifiers()); this.setMouseModifiersEx(e.getModifiersEx()); } - public void mouseReleased(java.awt.event.MouseEvent e) - { + @Override + public void mouseReleased(java.awt.event.MouseEvent e) { this.keyStateMap.remove(e.getButton()); - this.setMouseModifiers(0); this.setMouseModifiersEx(0); } - public void mouseEntered(java.awt.event.MouseEvent mouseEvent) - { + @Override + public void mouseEntered(java.awt.event.MouseEvent mouseEvent) { } - public void mouseExited(java.awt.event.MouseEvent mouseEvent) - { - + @Override + public void mouseExited(java.awt.event.MouseEvent mouseEvent) { + } - protected InputState getKeyState(int keyCode) - { + protected InputState getKeyState(int keyCode) { return this.keyStateMap.get(keyCode); } - protected void setKeyState(int keyCode, InputState state) - { + protected void setKeyState(int keyCode, InputState state) { this.keyStateMap.put(keyCode, state); } - protected void setModifiers(int modifiers) - { - this.modifiers = modifiers; + /** + * @param modifiers Unused. + * @deprecated Use {@link #setModifiersEx(int)} instead + */ + @Deprecated + protected void setModifiers(int modifiers) { + String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "setModifiers", "setModifiersEx"); + Logging.logger().severe(msg); } - protected void setModifiersEx(int modifiersEx) - { + protected void setModifiersEx(int modifiersEx) { this.modifiersEx = modifiersEx; } - protected void setMouseModifiersEx(int modifiersEx) - { + protected void setMouseModifiersEx(int modifiersEx) { this.mouseModifiersEx = modifiersEx; } - protected void setMouseModifiers(int modifiers) - { - this.mouseModifiers = modifiers; + /** + * @param modifiers Unused. + * @deprecated Use {@link #setMouseModifiersEx(int)} instead + */ + @Deprecated + protected void setMouseModifiers(int modifiers) { + String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "setMouseModifiers", "setMouseModifiersEx"); + Logging.logger().severe(msg); } - - protected void removeKeyState(KeyEvent e) { this.keyStateMap.remove(e.getKeyCode()); - this.setModifiers(e.getModifiers()); this.setModifiersEx(e.getModifiersEx()); } - protected long getTimeStamp(InputEvent e, int eventType, InputState currentState) - { + protected long getTimeStamp(InputEvent e, int eventType, InputState currentState) { // If the current state for this input event type exists and is not null, then keep the current timestamp. - if (currentState != null && currentState.getEventType() == eventType) + if (currentState != null && currentState.getEventType() == eventType) { return currentState.getTimestamp(); + } // Otherwise return the InputEvent's timestamp. return e.getWhen(); } -} \ No newline at end of file +} diff --git a/src/gov/nasa/worldwind/awt/KeyInputActionHandler.java b/src/gov/nasa/worldwind/awt/KeyInputActionHandler.java index 1bbb8da755..0e6d04fb00 100644 --- a/src/gov/nasa/worldwind/awt/KeyInputActionHandler.java +++ b/src/gov/nasa/worldwind/awt/KeyInputActionHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; diff --git a/src/gov/nasa/worldwind/awt/MouseInputActionHandler.java b/src/gov/nasa/worldwind/awt/MouseInputActionHandler.java index b34153d96f..a6eba53f58 100644 --- a/src/gov/nasa/worldwind/awt/MouseInputActionHandler.java +++ b/src/gov/nasa/worldwind/awt/MouseInputActionHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; diff --git a/src/gov/nasa/worldwind/awt/ViewInputActionHandler.java b/src/gov/nasa/worldwind/awt/ViewInputActionHandler.java index d2229ba88c..51a7558e86 100644 --- a/src/gov/nasa/worldwind/awt/ViewInputActionHandler.java +++ b/src/gov/nasa/worldwind/awt/ViewInputActionHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; diff --git a/src/gov/nasa/worldwind/awt/ViewInputAttributes.java b/src/gov/nasa/worldwind/awt/ViewInputAttributes.java index 0c248527ab..472a8293f6 100644 --- a/src/gov/nasa/worldwind/awt/ViewInputAttributes.java +++ b/src/gov/nasa/worldwind/awt/ViewInputAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; diff --git a/src/gov/nasa/worldwind/awt/ViewInputHandler.java b/src/gov/nasa/worldwind/awt/ViewInputHandler.java index a87eb56a7a..54878e9d19 100644 --- a/src/gov/nasa/worldwind/awt/ViewInputHandler.java +++ b/src/gov/nasa/worldwind/awt/ViewInputHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java b/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java index 8d3a77ffcc..8a9942751b 100644 --- a/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java +++ b/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; @@ -14,35 +36,35 @@ import gov.nasa.worldwind.pick.PickedObjectList; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLCanvas; import java.awt.*; import java.beans.*; import java.util.*; /** - * WorldWindowGLCanvas is a heavyweight AWT component for displaying World Wind {@link Model}s (globe and + * WorldWindowGLCanvas is a heavyweight AWT component for displaying WorldWind {@link Model}s (globe and * layers). It's a self-contained component intended to serve as an application's WorldWindow. Construction * options exist to specify a specific graphics device and to share graphics resources with another graphics device. - *

    + *

    * Heavyweight AWT components such as instances of this class can be used in conjunction with lightweight Swing * components. A discussion of doing so is in the Heavyweight and Lightweight Issues section of the "JOGL User's Guide". All that's typically necessary is * to invoke the following methods of the indicated Swing classes: {@link javax.swing.ToolTipManager#setLightWeightPopupEnabled(boolean)}, * {@link javax.swing.JPopupMenu#setLightWeightPopupEnabled(boolean)} and {@link javax.swing.JPopupMenu#setLightWeightPopupEnabled(boolean)}. * These methods should be invoked within a static block within an application's main class. - *

    + *

    * This class is capable of supporting stereo devices. To cause a stereo device to be selected and used, specify the * Java VM property "gov.nasa.worldwind.stereo.mode=device" prior to creating an instance of this class. A stereo * capable {@link SceneController} such as {@link gov.nasa.worldwind.StereoSceneController} must also be specified in - * the World Wind {@link Configuration}. The default configuration specifies a stereo-capable controller. To prevent + * the WorldWind {@link Configuration}. The default configuration specifies a stereo-capable controller. To prevent * stereo from being used by subsequently opened {@code WorldWindowGLCanvas}es, set the property to a an empty string, - * "". If a stereo device cannot be selected and used, this falls back to a non-stereo device that supports World Wind's + * "". If a stereo device cannot be selected and used, this falls back to a non-stereo device that supports WorldWind's * minimum requirements. - *

    + *

    * Under certain conditions, JOGL replaces the GLContext associated with instances of this class. This then * necessitates that all resources such as textures that have been stored on the graphic devices must be regenerated for - * the new context. World Wind does this automatically by clearing the associated {@link GpuResourceCache}. Objects + * the new context. WorldWind does this automatically by clearing the associated {@link GpuResourceCache}. Objects * subsequently rendered automatically re-create those resources. If an application creates its own graphics resources, * including textures, vertex buffer objects and display lists, it must store them in the GpuResourceCache * associated with the current {@link gov.nasa.worldwind.render.DrawContext} so that they are automatically cleared, and @@ -72,6 +94,7 @@ public WorldWindowGLCanvas() this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) @@ -88,15 +111,14 @@ public WorldWindowGLCanvas() * * @param shareWith a WorldWindow with which to share graphics resources. * - * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, - * javax.media.opengl.GLContext, java.awt.GraphicsDevice) + * @see GLCanvas#GLCanvas(GLCapabilitiesImmutable, GLCapabilitiesChooser, GraphicsDevice) */ public WorldWindowGLCanvas(WorldWindow shareWith) { super(Configuration.getRequiredGLCapabilities(), new BasicGLCapabilitiesChooser(), null); if (shareWith != null) - this.setSharedContext(shareWith.getContext()); + this.setSharedAutoDrawable((WorldWindowGLCanvas) shareWith); try { @@ -110,6 +132,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith) this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) @@ -128,8 +151,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith) * @param device the GraphicsDevice on which to create the window. May be null, in which case the * default screen device of the local {@link GraphicsEnvironment} is used. * - * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, - * javax.media.opengl.GLContext, java.awt.GraphicsDevice) + * @see GLCanvas#GLCanvas(GLCapabilitiesImmutable, GLCapabilitiesChooser, GraphicsDevice) */ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device) { @@ -150,6 +172,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) @@ -172,8 +195,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device * @param chooser a chooser object that customizes the specified capabilities. May be null, in which case a * default chooser is used. * - * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, - * javax.media.opengl.GLContext, java.awt.GraphicsDevice) + * @see GLCanvas#GLCanvas(GLCapabilitiesImmutable, GLCapabilitiesChooser, GraphicsDevice) */ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device, GLCapabilities capabilities, GLCapabilitiesChooser chooser) @@ -194,6 +216,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java index 6682737373..5630b5b874 100644 --- a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java +++ b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.awt; @@ -14,34 +36,34 @@ import gov.nasa.worldwind.pick.PickedObjectList; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; import java.beans.*; import java.util.*; /** - * WorldWindowGLCanvas is a lightweight Swing component for displaying World Wind {@link Model}s (globe and + * WorldWindowGLCanvas is a lightweight Swing component for displaying WorldWind {@link Model}s (globe and * layers). It's a self-contained component intended to serve as an application's WorldWindow. Construction * options exist to specify a specific graphics device and to share graphics resources with another graphics device. - *

    + *

    * Note: The Java SDK for OpenGL (JOGL) support for the underlying {@link GLJPanel} that this class uses has * historically been problematic. It works well on some devices but not on others, and its performance varies much more * among devices than that of its heavyweight counterpart, {@link WorldWindowGLCanvas}. It's therefore best to use the * heavyweight component if possible. You can find detailed information on this issue in the Heavyweight and * Lightweight Issues section of the "JOGL User's * Guide" - *

    + *

    * This class is capable of supporting stereo devices. To cause a stereo device to be selected and used, specify the * Java VM property "gov.nasa.worldwind.stereo.mode=device" prior to creating an instance of this class. A stereo * capable {@link SceneController} such as {@link gov.nasa.worldwind.StereoSceneController} must also be specified in - * the World Wind {@link Configuration}. The default configuration specifies a stereo-capable controller. To prevent + * the WorldWind {@link Configuration}. The default configuration specifies a stereo-capable controller. To prevent * stereo from being used by subsequently opened {@code WorldWindowGLCanvas}es, set the property to a an empty string, - * "". If a stereo device cannot be selected and used, this falls back to a non-stereo device that supports World Wind's + * "". If a stereo device cannot be selected and used, this falls back to a non-stereo device that supports WorldWind's * minimum requirements. - *

    + *

    * Under certain conditions, JOGL replaces the GLContext associated with instances of this class. This then * necessitates that all resources such as textures that have been stored on the graphic devices must be regenerated for - * the new context. World Wind does this automatically by clearing the associated {@link GpuResourceCache}. Objects + * the new context. WorldWind does this automatically by clearing the associated {@link GpuResourceCache}. Objects * subsequently rendered automatically re-create those resources. If an application creates its own graphics resources, * including textures, vertex buffer objects and display lists, it must store them in the GpuResourceCache * associated with the current {@link gov.nasa.worldwind.render.DrawContext} so that they are automatically cleared, and @@ -71,6 +93,7 @@ public WorldWindowGLJPanel() this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) @@ -87,8 +110,7 @@ public WorldWindowGLJPanel() * * @param shareWith a WorldWindow with which to share graphics resources. * - * @see GLJPanel#GLJPanel(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, - * javax.media.opengl.GLContext) + * @see GLJPanel#GLJPanel(GLCapabilitiesImmutable, GLCapabilitiesChooser) */ public WorldWindowGLJPanel(WorldWindow shareWith) { @@ -109,6 +131,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith) this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) @@ -130,8 +153,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith) * @param chooser a chooser object that customizes the specified capabilities. May be null, in which case a * default chooser is used. * - * @see GLJPanel#GLJPanel(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, - * javax.media.opengl.GLContext) + * @see GLJPanel#GLJPanel(GLCapabilitiesImmutable, GLCapabilitiesChooser) */ public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities, GLCapabilitiesChooser chooser) @@ -153,6 +175,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities, this.createView(); this.createDefaultInputHandler(); WorldWind.addPropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this); + WorldWindowImpl.configureIdentityPixelScale(this); this.wwd.endInitialization(); } catch (Exception e) diff --git a/src/gov/nasa/worldwind/cache/AbstractFileStore.java b/src/gov/nasa/worldwind/cache/AbstractFileStore.java index ce585e62c9..d0534b2419 100644 --- a/src/gov/nasa/worldwind/cache/AbstractFileStore.java +++ b/src/gov/nasa/worldwind/cache/AbstractFileStore.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -612,7 +634,7 @@ else if (file.getParentFile().mkdirs()) } /** - * @param url the "file:" URL of the file to remove from the file store. Only files in the writable World Wind disk + * @param url the "file:" URL of the file to remove from the file store. Only files in the writable WorldWind disk * cache or temp file directory are removed by this method. * * @throws IllegalArgumentException if url is null diff --git a/src/gov/nasa/worldwind/cache/BasicDataFileStore.java b/src/gov/nasa/worldwind/cache/BasicDataFileStore.java index 3211b5583b..b3821e7100 100644 --- a/src/gov/nasa/worldwind/cache/BasicDataFileStore.java +++ b/src/gov/nasa/worldwind/cache/BasicDataFileStore.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -52,14 +74,13 @@ public class BasicDataFileStore extends AbstractFileStore * requested that does not have a format suffix, requestFile appends a suffix appropriate for the * content type returned by the server. Subsequent calls to requestFile use the content types in this * list to find the content type matching the cached file. - *

    - * This is initialized to the following list of default content types typically used in World Wind applications: - *

    + *

    + * This is initialized to the following list of default content types typically used in WorldWind applications: *

    • application/vnd.google-earth.kml+xml
    • application/vnd.google-earth.kmz
    • *
    • model/collada+xml
    • image/dds
    • image/gif
    • image/jpeg
    • image/jpg
    • *
    • image/png
    - *

    - * This list may be overridden by specifying a comma-delimited list of content types in the World Wind configuration + *

    + * This list may be overridden by specifying a comma-delimited list of content types in the WorldWind configuration * parameter gov.nasa.worldwind.avkey.CacheContentTypes. */ protected List cacheContentTypes = new ArrayList(DEFAULT_CACHE_CONTENT_TYPES); @@ -249,7 +270,7 @@ public synchronized URL requestFile(String address) throw new IllegalStateException(message); } - // Store remote files in the World Wind cache by default. This provides backward compatibility with applications + // Store remote files in the WorldWind cache by default. This provides backward compatibility with applications // depending on requestFile's behavior prior to the addition of the cacheRemoteFile parameter. return this.requestFile(address, true); } @@ -307,13 +328,13 @@ else if (url == null) /** * Returns a file from the cache, the local file system or the classpath if the file exists. The specified address * may be a jar URL. See {@link java.net.JarURLConnection} for a description of jar URLs. If - * searchLocalCache is true this looks for the file in the World Wind cache, otherwise + * searchLocalCache is true this looks for the file in the WorldWind cache, otherwise * this only looks for the file in the local file system and the classpath. * * @param address the name used to identify the cached file. * @param retrievalUrl the URL to obtain the file if it is not in the cache. Used only to determine a location * to search in the local cache. May be null. - * @param searchLocalCache true to look for the file in the World Wind cache, otherwise + * @param searchLocalCache true to look for the file in the WorldWind cache, otherwise * false. * * @return the requested file if it exists, otherwise null. @@ -361,7 +382,7 @@ protected synchronized URL getLocalFileUrl(String address, URL retrievalUrl, boo } } - // If the address is a file, look for the file in the classpath and World Wind disk cache. We perform this step + // If the address is a file, look for the file in the classpath and WorldWind disk cache. We perform this step // regardless of the searchLocalCache parameter, because this looks for the file in the classpath. // We need to ensure that the address is not a network address (HTTP, etc.) because the getResource call in // findFile will attempt to retrieve from that URL on the thread that called this method, which might be the EDT @@ -369,7 +390,7 @@ protected synchronized URL getLocalFileUrl(String address, URL retrievalUrl, boo if (cacheFileUrl == null && (addressProtocol == null || addressProtocol.equals("file"))) cacheFileUrl = WorldWind.getDataFileStore().findFile(address, true); - // Look for the file in the World Wind disk cache by creating a cache path from the file's address. We ignore this + // Look for the file in the WorldWind disk cache by creating a cache path from the file's address. We ignore this // step if searchLocalCache is false. if (cacheFileUrl == null && retrievalUrl != null && searchLocalCache) { @@ -412,7 +433,7 @@ protected synchronized URL getLocalFileUrl(String address, URL retrievalUrl, boo /** * Returns the length of the resource referred to by a jar URL. Can be used to test whether the resource exists. - *

    + *

    * Note: This method causes the URL to open a connection and retrieve content length. * * @param jarUrl the jar URL. @@ -595,13 +616,13 @@ protected String makeCachePath(URL url, String contentType) /** * Makes a path to the file in the cache from the file's generic URL and content type. If the URL has a non-empty * query string, then this returns a path name formatted as follows: - *

    + *

    * host/hashCode/path_query.suffix - *

    + *

    * Otherwise, this returns a path name formatted as follows: - *

    + *

    * host/hashCode/path.suffix - *

    + *

    * Where host is the name of the host machine, hashCode is a four digit hash code computed * from the string "path" or "path_query" (if the URL has a query string), path is the URL's path part, * query is the URL's query string, and suffix is either the path's suffix or a suffix @@ -610,7 +631,7 @@ protected String makeCachePath(URL url, String contentType) * should a large number of files be requested from the same host. If two URLs have the same hash code, then both * URLs are stored under the same hashCode folder in the cache and are differentiated by their * path and query parts. - *

    + *

    * This removes any private parameters from the query string to ensure that those parameters are not written to the * file store as part of the cache name. For example, the "CONNECTID" query parameter typically encodes a user's * unique connection id, and must not be shared. Writing this parameter to the cache would expose that parameter to @@ -669,9 +690,9 @@ protected String makeGenericURLCachePath(URL url, String contentType) /** * Makes a path to the file in the cache from the file's JAR URL and content type. This returns a path name * formatted as follows: - *

    + *

    * host/path.suffix - *

    + *

    * Where host is the path to the JAR file, path is the file's path within the JAR archive, * and suffix is either the path's suffix or a suffix created from the specified content type. * @@ -772,10 +793,9 @@ protected String makeSuffix(String path, String contentType) * store as part of the cache name. For example, the "CONNECTID" query parameter typically encodes a user's unique * connection id, and must not be shared. Writing this parameter to the cache would expose that parameter to anyone * using the same machine. - *

    + *

    * This removes the key, the value, and any trailing parameter delimiter of all private parameters in the specified * query string. Recognized private query parameters are as follows: - *

    *

    • CONNECTID
    * * @param queryString the query string to examine. diff --git a/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java b/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java index 6690a9a531..76eb2d6d4f 100644 --- a/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java +++ b/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -9,7 +31,7 @@ import com.jogamp.opengl.util.texture.Texture; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.util.logging.Level; /** @@ -17,7 +39,7 @@ * maintains a map of resources that fit within a specifiable memory capacity. If adding a resource would exceed this * cache's capacity, existing but least recently used resources are removed from the cache to make room. The cache is * reduced to the "low water" size in this case (see {@link #setLowWater(long)}. - *

    + *

    * When a resource is removed from the cache, and if it is a recognized OpenGL resource -- a texture, a list of vertex * buffer IDs, a list of display list IDs, etc. -- and there is a current Open GL context, the appropriate glDelete * function is called to de-register the resource with the GPU. If there is no current OpenGL context the resource is @@ -196,9 +218,9 @@ public synchronized void setCapacity(long newCapacity) /** * Sets the new low water level in bytes, which controls how aggresively the cache discards items. - *

    + *

    * When the cache fills, it removes items until it reaches the low water level. - *

    + *

    * Setting a high loWater level will increase cache misses, but decrease average add time, but setting a low loWater * will do the opposite. * diff --git a/src/gov/nasa/worldwind/cache/BasicMemoryCache.java b/src/gov/nasa/worldwind/cache/BasicMemoryCache.java index 22103636e2..8895f4303f 100644 --- a/src/gov/nasa/worldwind/cache/BasicMemoryCache.java +++ b/src/gov/nasa/worldwind/cache/BasicMemoryCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -159,9 +181,9 @@ public void setCapacity(long newCapacity) /** * Sets the new low water level in cache units, which controls how aggresively the cache discards items. - *

    + *

    * When the cache fills, it removes items until it reaches the low water level. - *

    + *

    * Setting a high loWater level will increase cache misses, but decrease average add time, but setting a low loWater * will do the opposite. * @@ -189,7 +211,7 @@ public long getLowWater() /** * Returns true if the cache contains the item referenced by key. No guarantee is made as to whether or not the item * will remain in the cache for any period of time. - *

    + *

    * This function does not cause the object referenced by the key to be marked as accessed. getObject() * should be used for that purpose. * @@ -408,20 +430,4 @@ public String toString() return "MemoryCache " + this.name + " max size = " + this.getCapacity() + " current size = " + this.currentUsedCapacity.get() + " number of items: " + this.getNumObjects(); } - - @Override - protected void finalize() throws Throwable - { - try - { - // clear doesn't throw any checked exceptions - // but this is in case of an unchecked exception - // basically, we don't want to exit without calling super.finalize - this.clear(); - } - finally - { - super.finalize(); - } - } } diff --git a/src/gov/nasa/worldwind/cache/BasicMemoryCacheSet.java b/src/gov/nasa/worldwind/cache/BasicMemoryCacheSet.java index f0cdd0f026..28d42ab57d 100644 --- a/src/gov/nasa/worldwind/cache/BasicMemoryCacheSet.java +++ b/src/gov/nasa/worldwind/cache/BasicMemoryCacheSet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; diff --git a/src/gov/nasa/worldwind/cache/BasicRasterServerCache.java b/src/gov/nasa/worldwind/cache/BasicRasterServerCache.java index 7339ce3ac2..7f21a33a33 100644 --- a/src/gov/nasa/worldwind/cache/BasicRasterServerCache.java +++ b/src/gov/nasa/worldwind/cache/BasicRasterServerCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -21,7 +43,7 @@ * The BasicRasterServerCache is an implementation of the memory cache that is specific to store maximum * possible cacheable items, until the heap size allows. Once the memory limit is hit, it will drop ALL cached items. * Also, BasicRasterServerCache creates a pruner thread that removes all cached items which were not used for 20 seconds - * or more. The least recent use timeout is configurable via the setLeastRecentUseTimeout() method. In + * or more. The least recent use timeout is configurable via the setLeastRecentUseTimeout() method. In * addition, the BasicRasterServerCache allocates 100MB memory and keeps only a phantom reference to the * allocated 100M memory. Once any part of the application needs more memory the phantom referenced memory will be * immediately released and the phantom reference will be added to the internal reference queue, which is monitored by diff --git a/src/gov/nasa/worldwind/cache/BasicSessionCache.java b/src/gov/nasa/worldwind/cache/BasicSessionCache.java index 9ca9f6cd3a..ecf90b160f 100644 --- a/src/gov/nasa/worldwind/cache/BasicSessionCache.java +++ b/src/gov/nasa/worldwind/cache/BasicSessionCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -11,11 +33,11 @@ * BasicSessionCache is a general receiving area for data represented as key-value pairs. Entries in a BasicSessionCache * may persist for the length of a Virtual Machine's run time, but may be evicted if the cache size increases beyond its * capacity. - *

    + *

    * Eviction of BasicSessionCache entries is accomplished by controlling the maximum number of entries in the cache. This * maximum value is set by calling {@link #setCapacity(int)}. The eldest entry in the cache (the first entry added) is * always evicted before any others. - *

    + *

    * BasicSessionClass is a thread safe class. Access to the cache data structures is synchronized at the method level. * Care must be taken by subclasses to ensure that method level synchronization is maintained. * diff --git a/src/gov/nasa/worldwind/cache/Cacheable.java b/src/gov/nasa/worldwind/cache/Cacheable.java index c3db412c65..e7287e54d9 100644 --- a/src/gov/nasa/worldwind/cache/Cacheable.java +++ b/src/gov/nasa/worldwind/cache/Cacheable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; diff --git a/src/gov/nasa/worldwind/cache/FileStore.java b/src/gov/nasa/worldwind/cache/FileStore.java index 98c5b3d8e8..6051ee9ce3 100644 --- a/src/gov/nasa/worldwind/cache/FileStore.java +++ b/src/gov/nasa/worldwind/cache/FileStore.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -100,7 +122,7 @@ public interface FileStore extends WWObject /** * Creates a new, empty file in the file store. - *

    + *

    * If the file store has no write location, the file is not created and null is returned. * * @param fileName the name of the file to create. @@ -200,7 +222,7 @@ public interface FileStore extends WWObject * Requests a file. If the file exists locally, including as a resource on the classpath, this returns a * {@link URL} to the file. Otherwise if the specified address is a URL to a remote location, this * initiates a request for the file and returns null. When the request succeeds the file is stored in - * the local World Wind cache and subsequent invocations of this method return a URL to the retrieved file. + * the local WorldWind cache and subsequent invocations of this method return a URL to the retrieved file. * * @param address the file address: either a local file, a URL, or a path relative to the root of the file store. * @@ -215,20 +237,20 @@ public interface FileStore extends WWObject * Requests a file and specifies whether to store retrieved files in the cache or in a temporary location. If the * file exists locally, including as a resource on the classpath, this returns a {@link URL} to the * file. Otherwise if the specified address is a URL to a remote location, this initiates a request for the file and - * returns null. When the request succeeds the file is stored either in the local World Wind cache or + * returns null. When the request succeeds the file is stored either in the local WorldWind cache or * in a temporary location and subsequent invocations of this method return a URL to the retrieved file. - *

    - * The cacheRemoteFile parameter specifies whether to store a retrieved remote file in the World Wind + *

    + * The cacheRemoteFile parameter specifies whether to store a retrieved remote file in the WorldWind * cache or in a temporary location. This parameter has no effect if the file exists locally. The temporary location * for a retrieved file does not persist between runtime sessions, and subsequent invocations of this method may not * return the same temporary location. - *

    + *

    * If a remote file is requested multiple times with different values for cacheRemoteFile, it is - * undefined whether the retrieved file is stored in the World Wind cache or in a temporary location. + * undefined whether the retrieved file is stored in the WorldWind cache or in a temporary location. * * @param address the file address: either a local file, a URL, or a path relative to the root of the file * store. - * @param cacheRemoteFile true to store remote files in the World Wind cache, or false to + * @param cacheRemoteFile true to store remote files in the WorldWind cache, or false to * store remote files in a temporary location. Has no effect if the address is a local file. * * @return the file's URL if it exists locally or is a remote file that has been retrieved, otherwise diff --git a/src/gov/nasa/worldwind/cache/FileStoreFilter.java b/src/gov/nasa/worldwind/cache/FileStoreFilter.java index da566d651a..93e36ed3a0 100644 --- a/src/gov/nasa/worldwind/cache/FileStoreFilter.java +++ b/src/gov/nasa/worldwind/cache/FileStoreFilter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; diff --git a/src/gov/nasa/worldwind/cache/GpuResourceCache.java b/src/gov/nasa/worldwind/cache/GpuResourceCache.java index c33dac15e3..24213a450f 100644 --- a/src/gov/nasa/worldwind/cache/GpuResourceCache.java +++ b/src/gov/nasa/worldwind/cache/GpuResourceCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; diff --git a/src/gov/nasa/worldwind/cache/MemoryCache.java b/src/gov/nasa/worldwind/cache/MemoryCache.java index bf4591df9f..0f902e97f4 100644 --- a/src/gov/nasa/worldwind/cache/MemoryCache.java +++ b/src/gov/nasa/worldwind/cache/MemoryCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -57,7 +79,7 @@ public interface CacheListener void removeCacheListener(CacheListener listener); /** - * Discovers whether or not this cache contains the object referenced by key. Currently no interface exists + * Discovers whether or not this cache contains the object referenced by key . Currently no interface exists * to discover if an object resides in the cache by referencing itself. * * @param key the key which the object is referenced by. @@ -70,10 +92,10 @@ public interface CacheListener * Attempts to add the object clientObject, with size objectSize and referred to by * key to the cache. objectSize is the size in cache units, but is not checked for * accuracy. Returns whether or not the add was successful. - *

    + *

    * Note that the size passed in may be used, rather than the real size of the object. In some implementations, the * accuracy of the space used calls will depend on the collection of these sizes, rather than actual size. - *

    + *

    * This method should be declared synchronized when it is implemented. * * @param key an object used to reference the cached item. @@ -87,7 +109,7 @@ public interface CacheListener /** * Attempts to add the Cacheable object referenced by the key. No explicit size value is required as * this method queries the Cacheable to discover the size. - *

    + *

    * This method should be declared synchronized when it is implemented. * * @param key an object used to reference the cached item. @@ -120,7 +142,7 @@ public interface CacheListener /** * Empties the cache. After calling clear() on a MemoryCache, calls relating to used * capacity and number of items should return zero and the free capacity should be the maximum capacity. - *

    + *

    * This method should be declared synchronized when it is implemented and should notify all * CacheListeners of entries removed. */ diff --git a/src/gov/nasa/worldwind/cache/MemoryCacheSet.java b/src/gov/nasa/worldwind/cache/MemoryCacheSet.java index e9b69bac8d..90746bcaae 100644 --- a/src/gov/nasa/worldwind/cache/MemoryCacheSet.java +++ b/src/gov/nasa/worldwind/cache/MemoryCacheSet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; diff --git a/src/gov/nasa/worldwind/cache/SessionCache.java b/src/gov/nasa/worldwind/cache/SessionCache.java index 32ae9bdd70..dc0bfe95fe 100644 --- a/src/gov/nasa/worldwind/cache/SessionCache.java +++ b/src/gov/nasa/worldwind/cache/SessionCache.java @@ -1,14 +1,36 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; /** * SessionCache is a general receiving area for data represented as key-value pairs. Entries in a SessionCache may * persist for the length of a Virtual Machine's run time, but may be evicted at any time. - *

    + *

    * Eviction of SessionCache entries is accomplished by controlling the maximum number of entries in the cache. This * maximum value is set by calling {@link #setCapacity(int)}. A SessionCache may be implemented with any eviction policy * (including a policy of no eviction). Most implementations evict the eldest entry added to the cache. diff --git a/src/gov/nasa/worldwind/cache/ShapeDataCache.java b/src/gov/nasa/worldwind/cache/ShapeDataCache.java index 20362ee0c7..82aa84cf19 100644 --- a/src/gov/nasa/worldwind/cache/ShapeDataCache.java +++ b/src/gov/nasa/worldwind/cache/ShapeDataCache.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.cache; @@ -17,7 +39,7 @@ /** * Provides a mechanism to manage globe-specific representations of shapes. Typically used to manage per-globe state * when the application associates the same shape with multiple {@link gov.nasa.worldwind.WorldWindow}s. - *

    + *

    * This cache limits the amount of time an entry remains in the cache unused. The maximum unused time may be specified. * Entries unused within the specified duration are removed from the cache each time {@link * #getEntry(gov.nasa.worldwind.globes.Globe)} is called. @@ -272,7 +294,7 @@ public void addEntry(ShapeDataCacheEntry entry) /** * Retrieves a specified entry from the cache. - *

    + *

    * Note: Each time this method is called the cache is cleared of dead entries, as defined by their last-used time * relative to this cache's maximum unused time. * diff --git a/src/gov/nasa/worldwind/data/AbstractDataRaster.java b/src/gov/nasa/worldwind/data/AbstractDataRaster.java index 54a0bac424..b641c2697a 100644 --- a/src/gov/nasa/worldwind/data/AbstractDataRaster.java +++ b/src/gov/nasa/worldwind/data/AbstractDataRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -213,12 +235,12 @@ public DataRaster getSubRaster(int width, int height, Sector sector, AVList para * Reads the specified region of interest (ROI) with given extent, width, and height, and type * * @param params Required parameters are: - *

    + *

    * AVKey.HEIGHT as Integer, specifies a height of the desired ROI AVKey.WIDTH as Integer, specifies a * width of the desired ROI AVKey.SECTOR as Sector, specifies an extent of the desired ROI - *

    + *

    * Optional parameters are: - *

    + *

    * AVKey.BAND_ORDER as array of integers, examples: for RGBA image: new int[] { 0, 1, 2, 3 }, or for * ARGB image: new int[] { 3, 0, 1, 2 } or if you want only RGB bands of the RGBA image: new int[] { * 0, 1, 2 } or only Intensity (4th) band of the specific aerial image: new int[] { 3 } diff --git a/src/gov/nasa/worldwind/data/AbstractDataRasterReader.java b/src/gov/nasa/worldwind/data/AbstractDataRasterReader.java index 8406cd606b..6bf038b5b0 100644 --- a/src/gov/nasa/worldwind/data/AbstractDataRasterReader.java +++ b/src/gov/nasa/worldwind/data/AbstractDataRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/AbstractDataRasterWriter.java b/src/gov/nasa/worldwind/data/AbstractDataRasterWriter.java index 1e0b5e3bb4..f3b93921e5 100644 --- a/src/gov/nasa/worldwind/data/AbstractDataRasterWriter.java +++ b/src/gov/nasa/worldwind/data/AbstractDataRasterWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/AbstractDataStoreProducer.java b/src/gov/nasa/worldwind/data/AbstractDataStoreProducer.java index 1be49da194..0cbaa981c9 100644 --- a/src/gov/nasa/worldwind/data/AbstractDataStoreProducer.java +++ b/src/gov/nasa/worldwind/data/AbstractDataStoreProducer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/BILRasterReader.java b/src/gov/nasa/worldwind/data/BILRasterReader.java index 7b6c5befb1..25096f9baa 100644 --- a/src/gov/nasa/worldwind/data/BILRasterReader.java +++ b/src/gov/nasa/worldwind/data/BILRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/BILRasterWriter.java b/src/gov/nasa/worldwind/data/BILRasterWriter.java index 51460183b5..e18fe8606f 100644 --- a/src/gov/nasa/worldwind/data/BILRasterWriter.java +++ b/src/gov/nasa/worldwind/data/BILRasterWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java b/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java index 3536f10a2a..97c469832f 100644 --- a/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java +++ b/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -21,9 +43,9 @@ * {@link gov.nasa.worldwind.data.ImageIORasterReader} * - *

    + *

    * To specify a different factory, set the {@link gov.nasa.worldwind.avlist.AVKey#DATA_RASTER_READER_FACTORY_CLASS_NAME} - * value in {@link gov.nasa.worldwind.Configuration}, either directly or via the World Wind configuration file. To add + * value in {@link gov.nasa.worldwind.Configuration}, either directly or via the WorldWind configuration file. To add * readers to the default set, create a subclass of this class, override {@link #findReaderFor(Object, * gov.nasa.worldwind.avlist.AVList)}, and specify the new class to the configuration. * diff --git a/src/gov/nasa/worldwind/data/BasicRasterServer.java b/src/gov/nasa/worldwind/data/BasicRasterServer.java index f632cd6291..c11bfecc58 100644 --- a/src/gov/nasa/worldwind/data/BasicRasterServer.java +++ b/src/gov/nasa/worldwind/data/BasicRasterServer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -163,7 +185,7 @@ protected void setDataSetPixelFormat(String pixelFormat) } /** - * Extracts all key and values from the given DOM element + * Extracts all Property key and values from the given DOM element * * @param config Parsed configuration document. */ @@ -372,7 +394,7 @@ public Sector getSector() * * @param reqParams This is a required parameter, must not be null or empty; Must contain AVKey.WIDTH, AVKey.HEIGHT, * and AVKey.SECTOR values. - *

    + *

    * Optional keys are: AVKey.PIXEL_FORMAT (AVKey.ELEVATION | AVKey.IMAGE) AVKey.DATA_TYPE * AVKey.BYTE_ORDER (AVKey.BIG_ENDIAN | AVKey.LITTLE_ENDIAN ) * @@ -501,7 +523,7 @@ else if (AVKey.IMAGE.equals(this.getStringValue(AVKey.PIXEL_FORMAT))) * @param params This is a required parameter, must not be null or empty; Must contain AVKey.WIDTH, AVKey.HEIGHT, * AVKey.SECTOR, and AVKey.IMAGE_FORMAT (mime type) values. Supported mime types are: "image/png", * "image/jpeg", "image/dds". - *

    + *

    * Optional keys are: AVKey.PIXEL_FORMAT (AVKey.ELEVATION | AVKey.IMAGE) AVKey.DATA_TYPE * AVKey.BYTE_ORDER (AVKey.BIG_ENDIAN | AVKey.LITTLE_ENDIAN ) * diff --git a/src/gov/nasa/worldwind/data/BufferWrapperRaster.java b/src/gov/nasa/worldwind/data/BufferWrapperRaster.java index d165ffceb2..ba6e71aada 100644 --- a/src/gov/nasa/worldwind/data/BufferWrapperRaster.java +++ b/src/gov/nasa/worldwind/data/BufferWrapperRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -190,7 +212,7 @@ DataRaster doGetSubRaster(int width, int height, Sector sector, AVList params) * This returns a new sub-raster initialized with the specified properties. Called from doGetSubRaster * to create the sub-raster instance before populating its contents. This does not place any restrictions on the * specified width, height, sector or params. - *

    + *

    * This returns a {@link gov.nasa.worldwind.util.BufferWrapper.ByteBufferWrapper}, a subclass of * BufferWrapperRaster backed by a ByteBuffer. * diff --git a/src/gov/nasa/worldwind/data/BufferedImageRaster.java b/src/gov/nasa/worldwind/data/BufferedImageRaster.java index 86ecedf272..5a609b82e7 100644 --- a/src/gov/nasa/worldwind/data/BufferedImageRaster.java +++ b/src/gov/nasa/worldwind/data/BufferedImageRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/ByteBufferRaster.java b/src/gov/nasa/worldwind/data/ByteBufferRaster.java index b380222d62..f3782266a4 100644 --- a/src/gov/nasa/worldwind/data/ByteBufferRaster.java +++ b/src/gov/nasa/worldwind/data/ByteBufferRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/CachedDataRaster.java b/src/gov/nasa/worldwind/data/CachedDataRaster.java index 4bb859b780..aa445e1a50 100644 --- a/src/gov/nasa/worldwind/data/CachedDataRaster.java +++ b/src/gov/nasa/worldwind/data/CachedDataRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -49,7 +71,7 @@ protected enum ErrorHandlerMode * @param source the location of the local file, expressed as either a String path, a File, or a file URL. * @param params metadata as AVList, it is expected to next parameters: AVKey.WIDTH, AVKey.HEIGHT, AVKey.SECTOR, * AVKey.PIXEL_FORMAT. - *

    + *

    * If any of these keys is missing, there will be an attempt made to retrieve missign metadata from * the source using the reader. * @param reader A reference to a DataRasterReader instance diff --git a/src/gov/nasa/worldwind/data/DDSRasterReader.java b/src/gov/nasa/worldwind/data/DDSRasterReader.java index 92832c2fb8..2da0d92311 100644 --- a/src/gov/nasa/worldwind/data/DDSRasterReader.java +++ b/src/gov/nasa/worldwind/data/DDSRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/DDSRasterWriter.java b/src/gov/nasa/worldwind/data/DDSRasterWriter.java index 60427b90d8..08dd578f22 100644 --- a/src/gov/nasa/worldwind/data/DDSRasterWriter.java +++ b/src/gov/nasa/worldwind/data/DDSRasterWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/DTEDRasterReader.java b/src/gov/nasa/worldwind/data/DTEDRasterReader.java index c8441119bf..d93c584881 100644 --- a/src/gov/nasa/worldwind/data/DTEDRasterReader.java +++ b/src/gov/nasa/worldwind/data/DTEDRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/DataRaster.java b/src/gov/nasa/worldwind/data/DataRaster.java index c0ed391320..52b8f4ea3b 100644 --- a/src/gov/nasa/worldwind/data/DataRaster.java +++ b/src/gov/nasa/worldwind/data/DataRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/DataRasterReader.java b/src/gov/nasa/worldwind/data/DataRasterReader.java index 8f1ceec183..345810be8f 100644 --- a/src/gov/nasa/worldwind/data/DataRasterReader.java +++ b/src/gov/nasa/worldwind/data/DataRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -23,10 +45,10 @@ public interface DataRasterReader extends AVList * The source may be one of the following: *

      *
    • {@link java.io.File}
    • - *
    • {@link String}
    + *
  • {@link String}
  • *
  • {@link java.io.InputStream}
  • *
  • {@link java.net.URL}
  • - *
      + *
    * * @param source the source to examine. * @param params parameters required by certain reader implementations. May be null for most readers. @@ -41,10 +63,10 @@ public interface DataRasterReader extends AVList * The source may be one of the following: *
      *
    • {@link java.io.File}
    • - *
    • {@link String}
    + *
  • {@link String}
  • *
  • {@link java.io.InputStream}
  • *
  • {@link java.net.URL}
  • - *
      + *
    * * @param source the source to read. * @param params parameters required by certain reader implementations. May be null for most readers. If non-null, @@ -61,10 +83,10 @@ public interface DataRasterReader extends AVList * The source may be one of the following: *
      *
    • {@link java.io.File}
    • - *
    • {@link String}
    + *
  • {@link String}
  • *
  • {@link java.io.InputStream}
  • *
  • {@link java.net.URL}
  • - *
      + *
    * * TODO: Why would the caller specify parameters to this method? * @@ -84,10 +106,10 @@ public interface DataRasterReader extends AVList * The source may be one of the following: *
      *
    • {@link java.io.File}
    • - *
    • {@link String}
    + *
  • {@link String}
  • *
  • {@link java.io.InputStream}
  • *
  • {@link java.net.URL}
  • - *
      + *
    * * @param source the source to examine. * @param params parameters required by certain reader implementations. May be null for most readers. @@ -103,10 +125,10 @@ public interface DataRasterReader extends AVList * The source may be one of the following: *
      *
    • {@link java.io.File}
    • - *
    • {@link String}
    + *
  • {@link String}
  • *
  • {@link java.io.InputStream}
  • *
  • {@link java.net.URL}
  • - *
      + *
    * * @param source the source to examine. * @param params parameters required by certain reader implementations. May be null for most readers. diff --git a/src/gov/nasa/worldwind/data/DataRasterReaderFactory.java b/src/gov/nasa/worldwind/data/DataRasterReaderFactory.java index ef7d679aa9..671e8a1739 100644 --- a/src/gov/nasa/worldwind/data/DataRasterReaderFactory.java +++ b/src/gov/nasa/worldwind/data/DataRasterReaderFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -18,7 +40,7 @@ public interface DataRasterReaderFactory * Search the list of available data raster readers for one that will read a specified data source. The * determination is based on both the data type and the data source reference; some readers may be able to open data * of the corresponding type but not as, for example, an InputStream or a URL. - *

    + *

    * The list of readers searched is determined by the DataRasterReaderFactory associated with the current {@link * gov.nasa.worldwind.Configuration}, as specified by the {@link gov.nasa.worldwind.avlist.AVKey#DATA_RASTER_READER_FACTORY_CLASS_NAME}. * If no factory is specified in the configuration, {@link gov.nasa.worldwind.data.BasicDataRasterReaderFactory} is diff --git a/src/gov/nasa/worldwind/data/DataRasterWriter.java b/src/gov/nasa/worldwind/data/DataRasterWriter.java index 04d22fe8e5..3b5b473547 100644 --- a/src/gov/nasa/worldwind/data/DataRasterWriter.java +++ b/src/gov/nasa/worldwind/data/DataRasterWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/DataStoreProducer.java b/src/gov/nasa/worldwind/data/DataStoreProducer.java index 38c7adff90..97b51cec6f 100644 --- a/src/gov/nasa/worldwind/data/DataStoreProducer.java +++ b/src/gov/nasa/worldwind/data/DataStoreProducer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/GDAL.java b/src/gov/nasa/worldwind/data/GDAL.java index 3a395aaf07..8dca2e8e1c 100644 --- a/src/gov/nasa/worldwind/data/GDAL.java +++ b/src/gov/nasa/worldwind/data/GDAL.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/GDALDataRaster.java b/src/gov/nasa/worldwind/data/GDALDataRaster.java index 5a93f5e89e..a1d04e91cc 100644 --- a/src/gov/nasa/worldwind/data/GDALDataRaster.java +++ b/src/gov/nasa/worldwind/data/GDALDataRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -274,16 +296,14 @@ public GDALDataRaster(Dataset ds) throws IllegalArgumentException /** * Extracts metadata and sets next key/value pairs: - *

    - *

    - *

    + *

    * AVKey.WIDTH - the maximum width of the image - *

    + *

    * AVKey.HEIGHT - the maximum height of the image - *

    + *

    * AVKey.COORDINATE_SYSTEM - one of the next values: AVKey.COORDINATE_SYSTEM_SCREEN * AVKey.COORDINATE_SYSTEM_GEOGRAPHIC AVKey.COORDINATE_SYSTEM_PROJECTED - *

    + *

    * AVKey.SECTOR - in case of Geographic CS, contains a regular Geographic Sector defined by lat/lon coordinates of * corners in case of Projected CS, contains a bounding box of the area * @@ -1011,18 +1031,12 @@ else if (srcNumOfBands >= 3) * Builds a writable data raster for the requested region of interest (ROI) * * @param params Required parameters are: - *

    - *

    AVKey.HEIGHT as Integer, specifies a height of the desired ROI - *

    - *

    AVKey.WIDTH as Integer, specifies a width of the desired ROI - *

    - *

    AVKey.SECTOR as Sector, specifies an extent of the desired ROI - *

    - *

    - *

    + *

    AVKey.HEIGHT as Integer, specifies a height of the desired ROI + *

    AVKey.WIDTH as Integer, specifies a width of the desired ROI + *

    AVKey.SECTOR as Sector, specifies an extent of the desired ROI + *

    * Optional parameters are: - *

    - *

    AVKey.BAND_ORDER as array of integers, examples: for RGBA image: new int[] { 0, 1, 2, 3 }, or + *

    AVKey.BAND_ORDER as array of integers, examples: for RGBA image: new int[] { 0, 1, 2, 3 }, or * for ARGB image: new int[] { 3, 0, 1, 2 } , or if you want only RGB bands of the RGBA image: new * int[] {0, 1, 2 }, or only Intensity (4th) band of the specific aerial image: new int[] { 3 } * diff --git a/src/gov/nasa/worldwind/data/GDALDataRasterReader.java b/src/gov/nasa/worldwind/data/GDALDataRasterReader.java index ce28105f0c..7f642da71e 100644 --- a/src/gov/nasa/worldwind/data/GDALDataRasterReader.java +++ b/src/gov/nasa/worldwind/data/GDALDataRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/GDALMetadata.java b/src/gov/nasa/worldwind/data/GDALMetadata.java index 272cd2fd26..3a1be9be21 100644 --- a/src/gov/nasa/worldwind/data/GDALMetadata.java +++ b/src/gov/nasa/worldwind/data/GDALMetadata.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/GeotiffRasterReader.java b/src/gov/nasa/worldwind/data/GeotiffRasterReader.java index 6ca9630d98..3ada4116f7 100644 --- a/src/gov/nasa/worldwind/data/GeotiffRasterReader.java +++ b/src/gov/nasa/worldwind/data/GeotiffRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/GeotiffRasterWriter.java b/src/gov/nasa/worldwind/data/GeotiffRasterWriter.java index 0ac58b3259..b760ddf7b6 100644 --- a/src/gov/nasa/worldwind/data/GeotiffRasterWriter.java +++ b/src/gov/nasa/worldwind/data/GeotiffRasterWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/ImageIORasterReader.java b/src/gov/nasa/worldwind/data/ImageIORasterReader.java index 8fd695d8aa..5a76128dc3 100644 --- a/src/gov/nasa/worldwind/data/ImageIORasterReader.java +++ b/src/gov/nasa/worldwind/data/ImageIORasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/ImageIORasterWriter.java b/src/gov/nasa/worldwind/data/ImageIORasterWriter.java index b437837c13..67a787e422 100644 --- a/src/gov/nasa/worldwind/data/ImageIORasterWriter.java +++ b/src/gov/nasa/worldwind/data/ImageIORasterWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/MipMappedBufferedImageRaster.java b/src/gov/nasa/worldwind/data/MipMappedBufferedImageRaster.java index 4d9fc0c4a4..a21449aa76 100644 --- a/src/gov/nasa/worldwind/data/MipMappedBufferedImageRaster.java +++ b/src/gov/nasa/worldwind/data/MipMappedBufferedImageRaster.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/RPFRasterReader.java b/src/gov/nasa/worldwind/data/RPFRasterReader.java index 9f37f896f3..8d590da45f 100644 --- a/src/gov/nasa/worldwind/data/RPFRasterReader.java +++ b/src/gov/nasa/worldwind/data/RPFRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/RasterServer.java b/src/gov/nasa/worldwind/data/RasterServer.java index 75ae404bcf..c063625f6c 100644 --- a/src/gov/nasa/worldwind/data/RasterServer.java +++ b/src/gov/nasa/worldwind/data/RasterServer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -21,7 +43,7 @@ public interface RasterServer * Composes a Raster and returns as ByteBuffer in the requested format (image or elevation) * * @param params Required parameters in params: - *

    + *

    * AVKey.WIDTH - the height of the requested raster AVKey.HEIGHT - the height of the requested raster * AVKey.SECTOR - a regular Geographic Sector defined by lat/lon coordinates of corners * diff --git a/src/gov/nasa/worldwind/data/RasterServerConfiguration.java b/src/gov/nasa/worldwind/data/RasterServerConfiguration.java index f69e5ec37c..669deb3a11 100644 --- a/src/gov/nasa/worldwind/data/RasterServerConfiguration.java +++ b/src/gov/nasa/worldwind/data/RasterServerConfiguration.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2015 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/TiledElevationProducer.java b/src/gov/nasa/worldwind/data/TiledElevationProducer.java index 17982b7547..503258f702 100644 --- a/src/gov/nasa/worldwind/data/TiledElevationProducer.java +++ b/src/gov/nasa/worldwind/data/TiledElevationProducer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/TiledImageProducer.java b/src/gov/nasa/worldwind/data/TiledImageProducer.java index ea782c8c54..a813fc1f88 100644 --- a/src/gov/nasa/worldwind/data/TiledImageProducer.java +++ b/src/gov/nasa/worldwind/data/TiledImageProducer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/TiledRasterProducer.java b/src/gov/nasa/worldwind/data/TiledRasterProducer.java index feeee398c6..3f00759df3 100644 --- a/src/gov/nasa/worldwind/data/TiledRasterProducer.java +++ b/src/gov/nasa/worldwind/data/TiledRasterProducer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; @@ -698,20 +720,20 @@ protected boolean isFinalLevel(LevelSet levelSet, int levelNumber, AVList params /** * Extracts a maximum level limit from the AVList if the AVList contains AVKey.TILED_RASTER_PRODUCER_LIMIT_MAX_LEVEL. * This method requires maxNumOfLevels - the actual maximum numbers of levels. - *

    + *

    * The AVKey.TILED_RASTER_PRODUCER_LIMIT_MAX_LEVEL could specify multiple things: - *

    + *

    * If the value of the AVKey.TILED_RASTER_PRODUCER_LIMIT_MAX_LEVEL is "Auto" (as String), the calculated limit of * levels will be 70% of the actual maximum numbers of levels maxNumOfLevels. - *

    + *

    * If the type of the value of the AVKey.TILED_RASTER_PRODUCER_LIMIT_MAX_LEVEL is Integer, it should contain an * integer number between 0 (for level 0 only) and the actual maximum numbers of levels * maxNumOfLevels. - *

    + *

    * It is also possible to specify the limit as percents, in this case the type of the * AVKey.TILED_RASTER_PRODUCER_LIMIT_MAX_LEVEL value must be "String", have a numeric value as text and the "%" * percent sign in the end. Examples: "100%", "25%", "50%", etc. - *

    + *

    * Value of AVKey.TILED_RASTER_PRODUCER_LIMIT_MAX_LEVEL could be a numeric string (for example, "3"), or Integer. * The value will be correctly extracted and compared with the maxNumOfLevels. Valid values must be * smaller or equal to maxNumOfLevels. @@ -952,8 +974,9 @@ protected Object findWriterFor(DataRaster raster, String formatSuffix, java.io.F * Installs the configuration file which describes the tiled data produced by this TiledRasterProducer. The install * location, configuration filename, and configuration file contents are derived from the specified parameter list. * This throws an exception if the configuration file cannot be installed for any reason. - *

    - * The parameter list must contain at least the following keys: + *

    + * The parameter list must contain at least the following keys:

    Key
    + * *
    Required Keys
    Key
    {@link gov.nasa.worldwind.avlist.AVKey#FILE_STORE_LOCATION}
    {@link * gov.nasa.worldwind.avlist.AVKey#DATA_CACHE_NAME}
    {@link * gov.nasa.worldwind.avlist.AVKey#DATASET_NAME}
    @@ -1028,7 +1051,8 @@ protected void installConfigFile(AVList params) throws Exception /** * Returns the location of the configuration file which describes the tiled data produced by this * TiledRasterProducer. The install location is derived from the specified parameter list. This returns null if the - * parameter list is null, or if it does not contain any of the following keys: + * parameter list is null, or if it does not contain any of the following keys:
    Key
    + * *
    Required Keys
    Key
    {@link gov.nasa.worldwind.avlist.AVKey#FILE_STORE_LOCATION}
    {@link * gov.nasa.worldwind.avlist.AVKey#DATA_CACHE_NAME}
    {@link * gov.nasa.worldwind.avlist.AVKey#DATASET_NAME}
    diff --git a/src/gov/nasa/worldwind/data/WWDotNetLayerSetConverter.java b/src/gov/nasa/worldwind/data/WWDotNetLayerSetConverter.java index b15793aa7b..48af8c75cb 100644 --- a/src/gov/nasa/worldwind/data/WWDotNetLayerSetConverter.java +++ b/src/gov/nasa/worldwind/data/WWDotNetLayerSetConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/package-info.java b/src/gov/nasa/worldwind/data/package-info.java new file mode 100644 index 0000000000..700285cd03 --- /dev/null +++ b/src/gov/nasa/worldwind/data/package-info.java @@ -0,0 +1,817 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

    + * This package provides classes for converting raw data sources into a form which can be used by standard WorldWind + * components, such as {@link gov.nasa.worldwind.layers.Layer} and {@link gov.nasa.worldwind.globes.ElevationModel}. The + * gov.nasa.worldwind.data package contains two key interfaces: DataRaster, and DataStoreProducer. Older versions of the + * gov.nasa.worldwind.data package included DataDescriptor, which has been removed from WorldWind. This section + * describes the role of each interface. A guide to updating code which uses DataDescriptor can be found + * here. + * + *

    + * {@link gov.nasa.worldwind.data.DataRaster} encapsulates the dimensions, geographic + * {@link gov.nasa.worldwind.geom.Sector}, and data of a two-dimensional raster grid. DataRaster provides an interface + * to draw one geographic raster into another, according to each raster's geographic bounds. There are three concrete + * implementations of DataRaster: + *

      + *
    • {@link gov.nasa.worldwind.data.BufferedImageRaster} - uses a {@link java.awt.image.BufferedImage} as a source of + * geographically referenced image data.
    • + *
    • {@link gov.nasa.worldwind.data.BufferWrapperRaster} - uses a {@link gov.nasa.worldwind.util.BufferWrapper} as a + * source of geographically referenced scalar data. BufferWrapperRaster typically represents integer or floating point + * elevation data.
    • + *
    • {@link gov.nasa.worldwind.data.CachedDataRaster} - a wrapper implementation of DataRaster which lazily loads a + * DataRaster from a specified source. The lazily loaded DataRaster is kept in a + * {@link gov.nasa.worldwind.cache.MemoryCache}, which can be shared across multiple CachedDataRasters. CachedDataRaster + * is useful when an application needs to operate on a number of raster data sources which do not fit into main + * memory.
    • + *
    + * Additionally, there are two interfaces for performing I/O operations on DataRaster: + *
      + *
    • {@link gov.nasa.worldwind.data.DataRasterReader} - implementations can read image formats accepted by + * {@link javax.imageio.ImageIO}, GeoTIFF images, GeoTIFF elevations, Raster Product Format (RPF) imagery, and Band + * Interleaved by Line (BIL) formatted data.
    • + *
    • {@link gov.nasa.worldwind.data.DataRasterWriter} - implementations can write image formats accepted by ImageIO, + * GeoTIFF images, GeoTIFF elevations, compressed Direct Draw Surface (DDS) images, and Band Interleaved by Line (BIL) + * formatted data.
    • + *
    + * +

    + * {@link gov.nasa.worldwind.data.DataStoreProducer} provides a common interface for converting raw data sources into a + * form which can be used by standard WorldWind components. There are three concrete implementations of + * DataStoreProducer: + *

      + *
    • {@link gov.nasa.worldwind.data.TiledElevationProducer} - converts georeferenced image files into the WorldWind + * tile cache structure, which can be rendered on the globe by a {@link gov.nasa.worldwind.layers.TiledImageLayer}. + *
    • + *
    • {@link gov.nasa.worldwind.data.TiledImageProducer} - converts georeferenced elevation data files into the World + * Wind tile cache structure, which can become part of the globe's surface terrain by using a + * {@link gov.nasa.worldwind.terrain.BasicElevationModel}.
    • + *
    • {@link gov.nasa.worldwind.data.WWDotNetLayerSetConverter} - converts data in the WorldWind .NET tile cache + * structure into the WorldWind Java tile cache structure.
    • + *
    + * +

    + * Data Configuration Documents are a common mechanism and file format for describing a WorldWind + * component's configuration. While data configuration documents are not part of the gov.nasa.worldwind.data package, + * they are used as a configuration exchange mechanism by the classes in gov.nasa.worldwind.data. For example, + * DataStoreProducer returns a DOM Document describing the data it produces. Understanding how to use data configuration + * documents is important to leveraging the functionality of the gov.nasa.worldwind.data package. The section + * Common Use Case Examples provides examples of how to use data configuration + * documents to manage the data produced by classes in this package. + * + *

    + * DataDescriptor defined an interface for representing meta information about WorldWind cache data. It + * has been replaced with data configuration documents, which provide a common mechanism to describe a component's + * configuration. For information how to update code which uses DataDescriptor, see the + * DataDescriptor Porting Guide. + * + * + * + * + * +

    Supported Formats

    + *
      + *
    • ADF - A proprietary BINARY format developed by ESRI for ARC/INFO GRID rasters stored in workspaces (INFO + * directory, *.adf) + *
    • + *
    • ADRG - ARC Digitized Raster Graphics format; requires General Information File and Image file (*.gen + *.img) + *
    • + *
    • AirSAR - AirSAR Polarimetric (POLSAR) data format; images in P,L,C-wavelengths only (*.dat OR *_[p|l|c].dat) + *
    • + *
    • ASC - A non-proprietary ASCII format developed by ESRI for ARC/INFO rasters in ASCII format (*.asc, *.grd)
    • + *
    • BAS - Fuji BAS Scanner Image (*.bas)
    • + *
    • BIL - Band Interleaved by Line format of satellite data rasters, must be .HDR labeled (*.bil)
    • + *
    • BIP - Band Interleaved by Pixel format of satellite data rasters, must be .HDR labeled (*.bip)
    • + *
    • BLX - Magellan designed format for storing topographic data in Magellan GPS units (*.blx)
    • + *
    • BMP - Microsoft Windows Device Independent Bitmap for raster graphics images, color and monochrome (*.bmp)
    • + *
    • CADRG - Compressed ARC Digitized Raster Graphics format for digital maps and chart images, RPF and NITFS + * compliant + *
    • + *
    • CIB - Controlled Image Base format for ortho-photos (rectified grayscale aerial images), RPF and NITFS compliant + *
    • + *
    • COASP - Defence R&D Canada (DRDC) designed data raster format for Configurable Airborne SAR Processor (*.coasp) + *
    • + *
    • COSAR - "COmplex SAR", Annotated Binary Matrix (TerraSAR-X), plain binary image raster, limited to 4GB size + * (*.cosar) + *
    • + *
    • DEM - USGS designed format for storing a raster-based Digital Elevation Model (*.dem)
    • + *
    • DOQ - USGS designed Digital Ortho Quad format for projections and transformations (*.doq)
    • + *
    • DTED - Digital Terrain Elevation Data format for regularly spaced grid of elevation points (*.dt0, *.dt1, *.dt2) + *
    • + *
    • ENVI - ENVI raster types of 1bit, 2bit, 4bit, or 8bit, Int16, Float32 , limited support for projections and + * datums(*.nvi + *.hdr) + *
    • + *
    • ESRI - ESRI raw raster data (aka ESRI BIL format) types of 8bit,16bit, and 32bit integers (*.bil + *.hdr)
    • + *
    • GFF - Ground-based SAR Applications Testbed File Format (.gff)
    • + *
    • GIF - CompuServe designed Graphics Interchange Format, up to 8bits per pixel, LWZ compressed (*.gif)
    • + *
    • GRC - Northwood/Vertical Mapper Classified Grid Format (*.grc , *.tab)
    • + *
    • GRD - Golden Software ASCII Grid (GSAG), Binary Grid (GSBG) and Golden Software 7 Binary Grid (GS7BG) (*.grd) + *
    • + *
    • GRD - Northwood/Vertical Mapper Numeric Grid Format (*.grd , *.tab)
    • + *
    • GXF - GeoSoft Grid Exchange Format is an ASCII grid format for storing elevation data (*.gxf)
    • + *
    • HGT - height format file for unprocessed global SRTM elevation data of 1x1 degree tiles (*.hgt or *.hgt.zip) + *
    • + *
    • ILWIS - ILWIS Raster Maps (*.mpr) and MapLists (*.mpl); projection info stored in the .CSY, georeference info in + * the .GRF + *
    • + *
    • ISIS - USGS Astrogeology ISIS file format, versions 2 and 3 (*.isis)
    • + *
    • JDEM - Japanese Digital Elevation Model for 32bit floating point elevation raster (*.mem)
    • + *
    • JP2 - Joint Photographic Experts Group format based on wavelet compression (*.jp2, *.jp2k)
    • + *
    • JPEG - Joint Photographic Experts Group format for images, uses lossy Digital Cosine Transform (DCT) compression + * (*.jpg, *.jpeg) + *
    • + *
    • LCP - FARSITE v.4 Landscape multi-band raster format for terrain and tree canopy data; Int16 only; no projection + * info, mostly UTM (.lcp) + *
    • + *
    • MFF - Vexcel MFF Raster (*.mff) and MFF2 (HKV) Raster (*.hdr)
    • + *
    • MrSID - LizardTech's Multi-resolution Seamless Image Database file format based on wavelet compression (*.sid) + *
    • + *
    • NAT - Meteosat Second Generation (MSG) Native Archive Format, supports up to 12 bands, 10bits per band (.nat) + *
    • + *
    • NITF - National Imagery Transmission Format for the exchange, storage, and transmission of digital documents + * (*.ntf, *.nitf) + *
    • + *
    • PCI - A database file format developed by PCI Geomatics for EASI/PACE remote sensing software (uncompressed .pix + * and *.pcidsk) + *
    • + *
    • PGM - Netpbm grayscale image format (Portable Graymap) (*.pgm)
    • + *
    • PNG - Portable Network Graphics format for grayscale, palette-based, and RGB-only images, lossless data + * compression, supports transparency (*.png) + *
    • + *
    • PPM - Netpbm color image format (Portable Pixmap) (*.ppm)
    • + *
    • RDB - R Raster Data (*.asc, *.rdb)
    • + *
    • RIK - Swedish Grid RIK format for maps issued by the Swedish organization Lantmäteriet (*.rik)
    • + *
    • RPF - Raster Product Formats for digital images (CIB), maps and charts (CADRG), NITFS compliant (A.TOC)
    • + *
    • SDAT - SAGA (System for Automated Geoscientific Analyses) GIS Binary Grid (binary dataset in *.sdat, ASCII header + * in *.sgrd) + *
    • + *
    • TER - Leveller heightfields file format to store a one band of Float32 elevation values (*.ter)
    • + *
    • TER - Terragen terrain file format to store a one band of Int16 elevation values (*.ter, *.terrain)
    • + *
    • TIFF - Tagged Image File Format (TIFF) and GeoTIFF (*.tif, *.tiff, *.gtif)
    • + * +
    • AirSAR, AirSAR Polarimetric Image, AirSAR
    • + *
    • BT, VTP .bt (Binary Terrain) 1.3 Format, BT
    • + *
    • CEOS, CEOS Image, CEOS
    • + *
    • COASP, DRDC COASP SAR Processor Raster, COASP
    • + *
    • COSAR, COSAR Annotated Binary Matrix (TerraSAR-X), COSAR
    • + *
    • CPG, Convair PolGASP, CPG
    • + *
    • DIMAP, SPOT DIMAP, DIMAP
    • + *
    • DIPEx, DIPEx, DIPEx
    • + *
    • EHdr, ESRI .hdr Labelled, EHdr
    • + *
    • EIR, Erdas Imagine Raw, EIR
    • + *
    • ELAS, ELAS, ELAS
    • + *
    • ENVI, ENVI .hdr Labelled, ENVI
    • + *
    • ERS, ERMapper .ers Labelled, ERS
    • + *
    • ESAT, Envisat Image Format, ESAT
    • + *
    • FAST, EOSAT FAST Format, FAST
    • + *
    • FIT, FIT Image, FIT
    • + *
    • FujiBAS, Fuji BAS Scanner Image, FujiBAS
    • + *
    • GenBin, Generic Binary (.hdr Labelled), GenBin
    • + *
    • GSC, GSC Geogrid, GSC
    • + * +
    • HFA, Erdas Imagine Images (.img)A
    • + *
    • IDA, Image Data and Analysis, IDA
    • + *
    • ILWIS, ILWIS Raster Map, ILWIS
    • + *
    • INGR, Intergraph Raster, INGR
    • + *
    • JAXAPALSAR, JAXA PALSAR Product Reader (Level 1.1/1.5), JAXAPALSAR
    • + *
    • L1B, NOAA Polar Orbiter Level 1b Data Set, L1B
    • + *
    • LAN, Erdas .LAN/.GIS, LAN
    • + *
    • LCP, FARSITE v.4 Landscape File (.lcp), LCP
    • + *
    • MEM, In Memory Raster, MEM
    • + *
    • MSGN, EUMETSAT Archive native (.nat), MSGN
    • + *
    • NDF, NLAPS Data Format, NDF
    • + *
    • PAux, PCI .aux Labelled, PAux
    • + *
    • PCIDSK, PCIDSK Database File, PCIDSK
    • + *
    • PDS, NASA Planetary Data System, PDS
    • + * +
    • RMF, Raster Matrix Format, RMF
    • + *
    • RS2, RadarSat 2 XML Product, RS2
    • + *
    • RST, Idrisi Raster A.1, RST
    • + *
    • SAGA, SAGA GIS Binary Grid (.sdat), SAGA
    • + *
    • SAR_CEOS, CEOS SAR Image, SAR_CEOS
    • + *
    • SDTS, SDTS Raster, SDTS
    • + *
    • SGI, SGI Image File Format 1.0, SGI
    • + *
    • SRP, Standard Raster Product (ASRP/USRP), SRP
    • + *
    • TIL, EarthWatch .TIL, TIL
    • + *
    • TSX, TerraSAR-X Product, TSX
    • + *
    • XPM, X11 PixMap Format, XPM
    • + * +
    + * + + * + * + * +

    Supported Projections

    + *
      + *
    • Albers Equal-Area Conic
    • + *
    • Azimuthal Equidistant
    • + *
    • Cassini-Soldner
    • + *
    • Cylindrical Equal Area
    • + *
    • Eckert IV
    • + *
    • Eckert VI
    • + *
    • Equidistant Conic
    • + *
    • Equidistant Cylindrical
    • + *
    • Equirectangular
    • + *
    • Gauss-Kruger
    • + *
    • Gall Stereographic
    • + *
    • GEOS - Geostationary Satellite View + *
    • Gnomonic
    • + *
    • Hotine Oblique Mercator
    • + *
    • Krovak
    • + *
    • Laborde Oblique Mercator
    • + *
    • Lambert Azimuthal Equal Area
    • + *
    • Lambert Conic Conformal (1SP)
    • + *
    • Lambert Conic Conformal (2SP)
    • + *
    • Lambert Conic Conformal (2SP Belgium)
    • + *
    • Lambert Cylindrical Equal Area
    • + *
    • Mercator (1SP)
    • + *
    • Mercator (2SP)
    • + *
    • Miller Cylindrical
    • + *
    • Mollweide
    • + *
    • New Zealand Map Grid
    • + *
    • Oblique Mercator
    • + *
    • Oblique Stereographic
    • + *
    • Orthographic
    • + *
    • Polar Stereographic
    • + *
    • Polyconic
    • + *
    • Robinson
    • + *
    • Rosenmund Oblique Mercator
    • + *
    • Sinusoidal
    • + *
    • Swiss Oblique Cylindrical
    • + *
    • Swiss Oblique Mercator
    • + *
    • Stereographic
    • + *
    • Transverse Mercator
    • + *
    • Transverse Mercator (Modified Alaska)
    • + *
    • Transverse Mercator (South Oriented)
    • + *
    • Tunisia Mining Grid
    • + *
    • VanDerGrinten
    • + *
    + * + + * + * + * +

    Deploying WorldWind's GDAL Libraries

    + * + The open-source GDAL and PROJ4 libraries are used to import many of WorldWind's supported data formats. WorldWind + * uses GDAL version 1.7.2 and PROJ4 version ?.? along with LizardTech's Decode SDK version 7.0.0.2167 for MrSID + * support. + * + * +

    Supported Platforms

    + * + GDAL and PROJ4 have been incorporated for MacOSX (Snow Leopard, 64-bit), Windows 32 and Windows 64. Support for Linux + * 32-bit and 64-bit, and Solaris are expected in the very near future. If the GDAL library cannot be found, data import + * operates without it but supports only a limited set of formats and projections, in particular, GeoTIFF, JPEG, PNG, + * BIL and DTED, and either EPSG:4326f (WGS84, latitude/longitude), or UTM. + * + *

    GDAL Library Locations

    + * + To simplify deployment, GDAL + PRO4 + MrSID bundles are provided as a single dynamic library with all dependent + * libraries included. There is one such library per platform, each located in + * lib-external/gdal/platform, as follows: + *
      + *
    • Windows 32bit library gdalalljni.dll is located in lib-external/gdal/win32/
    • + *
    • Windows 64bit library gdalalljni.dll is located in lib-external/gdal/win64/
    • + *
    • Mac OSX library libgdalalljni.jnilib is in lib-external/gdal/macosx/
    • + *
    + * The GDAL and PROJ4 libraries require data tables located in lib-external/gdal/data. WorldWind attempts + * to locate GDAL libraries during startup. By default WorldWind will first look in the locations listed above, then in + * the current path, and if no GDAL bundle was found, will try to locate the GDAL bundle in the sub-folders. + * + * +

    Deploying with Java Web Start

    + * + Instructions for using the WorldWind GDAL libraries with a Java Web Start application are available at + * https://goworldwind.org/getting-started/. + * + * + * + * + * +

    Common Use Case Examples

    + * + The following examples demonstrate the most common use cases which the classes in gov.nasa.worldwind.data are + * designed to address. Additionally, several examples demonstrate data management use cases using data configuration + * documents. These examples constitute an overview of how to convert raw data sources into a form which can be consumed + * by WorldWind components, then manage the data in its converted form. + * + * + *

    + * Example 1: Converting Georeferenced Imagery to the WorldWind Tile Structure + * + *

    + *
    + * 
    + * // Given a source image, and a path to a folder in the local file system which receives the image tiles, configure a
    + * // TiledImageProducer to create a pyramid of images tiles in the WorldWind Java cache format.
    + * String imagePath = ...;
    + * String tiledImagePath = ...;
    + * String tiledImageDisplayName = ...;
    + *
    + * // Create a parameter list which defines where the image is imported, and the name associated with it.
    + * AVList params = new AVListImpl();
    + * params.setValue(AVKey.FILE_STORE_LOCATION, WWIO.getParentFilePath(tiledImagePath));
    + * params.setValue(AVKey.DATA_CACHE_NAME, WWIO.getFilename(tiledImagePath));
    + * params.setValue(AVKey.DATASET_NAME, tiledImageDisplayName);
    + *
    + * // Create a TiledImageProducer to transform the source image to a pyramid of images tiles in the WorldWind
    + * // Java cache format.
    + * DataStoreProducer producer = new TiledImageProducer();
    + * try
    + * {
    + * // Configure the TiledImageProducer with the parameter list and the image source.
    + * producer.setStoreParameters(params);
    + * producer.offerDataSource(new File(imagePath), null);
    + * // Import the source image into the FileStore by converting it to the WorldWind Java cache format. This throws
    + * // an exception if production fails for any reason.
    + * producer.startProduction();
    + * }
    + * catch (Exception e)
    + * {
    + * // Exception attempting to create the image tiles. Revert any change made during production.
    + * producer.removeProductionState();
    + * }
    + *
    + * // Extract the data configuration document from the production results. If production sucessfully completed, the
    + * // TiledImageProducer's production results contain a Document describing the converted imagery as a data
    + * // configuration document.
    + * Iterable<?> results = producer.getProductionResults();
    + * if (results == null || results.iterator() == null || !results.iterator().hasNext())
    + * return;
    + *
    + * Object o = results.iterator().next();
    + * if (o == null || !(o instanceof Document))
    + * return;
    + *
    + * Document dataConfigDoc = (Document) o;
    + * 
    + * 
    + *
    + * + + *

    + * Example 2: Converting Georeferenced Elevation Data to the WorldWind Tile Structure + * + *

    + * Converting georeferenced elevation data can be accomplished by referring to + * Example 1: Converting Georeferenced Imagery to the WorldWind Tile Structure, and replacing + * {@link gov.nasa.worldwind.data.TiledImageProducer} with {@link gov.nasa.worldwind.data.TiledElevationProducer}. + *
    + * + + *

    + * Example 3: Converting WorldWind .NET LayerSets to the WorldWind Java Tile Structure + * + *

    + * Converting WorldWind .NET LayerSets can be accomplished by referring to + * Example 1: Converting Georeferenced Imagery to the WorldWind Tile Structure, and replacing + * {@link gov.nasa.worldwind.data.TiledImageProducer} with {@link gov.nasa.worldwind.data.WWDotNetLayerSetConverter}. + *
    + * + + *

    + * Example 4: Reading Data Configuration Documents from the File System + *

    + *
    + * 
    + * // Given a string path to a data configuration file in the local file system, read the file as a DOM document, which
    + * // can be consumed by WorldWind's Layer and ElevationModel factories. This code is backward compatible with
    + * // DataDescriptor files. The method DataConfigurationUtils.convertToStandardDataConfigDocument automatically detects
    + * // and transforms DataDescriptor documents into standard Layer and ElevationModel configuration documents.
    + * String dataConfigPath = ...;
    + * Document dataConfigDoc = WWXML.openDocument(dataConfigPath);
    + * dataConfigDoc = DataConfigurationUtils.convertToStandardDataConfigDocument(dataConfigDoc);
    + * 
    + * 
    + *
    + * + + *

    + * Example 5: Reading Data Configuration Documents from the WorldWind FileStore + * + *

    + *
    + * 
    + * // Given a path to a data configuration file in the WorldWind FileStore, read the file as a DOM document, which can
    + * // be consumed by WorldWind's Layer and ElevationModel factories. This code is backward compatible with
    + * // DataDescriptor files. The method DataConfigurationUtils.convertToStandardDataConfigDocument automatically detects
    + * // and transforms DataDescriptor documents into standard Layer or ElevationModel configuration documents.
    + * FileStore fileStore = ...;
    + * String dataConfigPath = ...;
    + *
    + * // Look for the data configuration file in the local file cache, but not in the class path.
    + * URL url = fileStore.findFile(dataConfigPath, false);
    + * if (url == null)
    + * {
    + * // The specified path name does not exist in the file store.
    + * return;
    + * }
    + *
    + * Document dataConfigDoc = WWXML.openDocument(url);
    + * dataConfigDoc = DataConfigurationUtils.convertToStandardDataConfigDocument(dataConfigDoc);
    + * 
    + * 
    + *
    + * + + *

    + * Example 6: Writing Data Configuration Documents + *

    + *
    + * 
    + * // Given a path to the data configuration file's destination in the local file system, and a parameter list
    + * // describing the data, create a standard data configuration document and write it to the file system. This code is
    + * // not forward compatible with applications still using DataDescriptor. Code which uses
    + * // FileStore.findDataDescriptors to find data configuration files, or DataDesccriptorReader to read data
    + * // configuration files will not be able to find or read the file produced by this example.
    + * String dataConfigPath = ...;
    + * AVList params = ...;
    + *
    + * // Create a data configuration document from the specified parameters.
    + * Document dataConfigDoc;
    + * if (isTiledImageryData)
    + * {
    + * // If you're writing a data configuration file for tiled imagery, use the following:
    + * dataConfigDoc = LayerConfiguration.createTiledImageLayerDocument(params);
    + * }
    + * else if (isTiledElevationData)
    + * {
    + * // If you're writing a data configuration file for tiled elevations, use the following:
    + * dataConfigDoc = ElevationModelConfiguration.createBasicElevationModelDocument(params);
    + * }
    + * else
    + * {
    + * // Otherwise, you'll need to create your own document. WorldWind currently provides support for creating data
    + * // configuration files for tiled imagery and tiled elevations. Write custom code to create a data configuration
    + * // document which corresponds with your data. Use LayerConfiguration and ElevationModelConfiguration as
    + * // references, and use the methods in WWXML to construct your document in memory.
    + * }
    + *
    + * // Write the data configuration document to the file system.
    + * WWXML.saveDocumentToFile(dataConfigDoc, dataConfigPath);
    + * 
    + * 
    + *
    + * + + *

    + * Example 7: Searching for Data Configuration Documents in the File System + *

    + *
    + * 
    + * // Given a search path in the local file system to look for data configuration files, return a list of file paths
    + * // representing the matches closest to the root: data configuration files who's ancestor directories contain another
    + * // data configuration file are ignored. The search path cannot be null. This code is backward compatible with
    + * // DataDescriptor files. The class DataConfigurationFilter accepts standard Layer and ElevationModel configuration
    + * // files, DataDescriptor files, and WorldWind .NET LayerSet files.
    + * String searchPath = ...;
    + * String[] filePaths = WWIO.listDescendantFilenames(searchPath, new DataConfigurationFilter());
    + *
    + * if (filePaths == null || filePaths.length == 0)
    + * {
    + * // No data configuration files found in the file system.
    + * return;
    + * }
    + * 
    + * 
    + *
    + * + + *

    + * Example 8: Searching for Data Configuration Documents in the WorldWind FileStore + * + *

    + * There are two methods of searching for data configuration files in the WorldWind FileStore. The first method + * individually searches each FileStore location using the method + * {@link gov.nasa.worldwind.util.WWIO#listDescendantFilenames(java.io.File, java.io.FileFilter, boolean)}. This method + * is equivalent to calling the method FileStore.findDataDescriptors(String) (which has been removed), and + * should be used by applications porting from DataDescriptor. Use this method when your application needs to control + * the FileStore locations it searches for data configuration files. + *
    + * 
    + * // Given a WorldWind FileStore location in which to look for data configuration files, return a list of cache names
    + * // representing the matches closest to the root: data configuration files who's ancestor directories contain another
    + * // data configuration file are ignored. This code is backward compatible with DataDescriptor files. The class
    + * // DataConfigurationFilter accepts standard Layer and ElevationModel configuration files, DataDescriptor files, and
    + * // WorldWind .NET LayerSet files.
    + * String fileStoreLocation = ...;
    + * String[] cacheNames = WWIO.listDescendantFilenames(fileStoreLocation, new DataConfigurationFilter(), false);
    + *
    + * if (cacheNames == null || cacheNames.length == 0)
    + * {
    + * // No data configuration files found in the FileStore.
    + * return;
    + * }
    + * 
    + * 
    The second method searches the entire WorldWind FileStore under a relative file store path. Use this method + * when your application doesn't care which FileStore location it searches for data configuration files, but may care + * what relative file store path it searches under. + *
    + * 
    + * // Given a search path in the WorldWind FileStore to look for data configuration files, return a list of cache
    + * // names representing the matches closest to the root: data configuration files who's ancestor directories contain
    + * // another data configuration file are ignored. If the search path is null, the method FileStore.listTopFileNames
    + * // searches the entire FileStore, excluding the class path. This code is backward compatible with DataDescriptor
    + * // files. The class DataConfigurationFilter accepts standard Layer and ElevationModel configuration files,
    + * // DataDescriptor files, and WorldWind .NET LayerSet files.
    + * FileStore fileStore = ...;
    + * String fileStoreSearchPath = ...;
    + * String[] cacheNames = fileStore.listTopFileNames(fileStoreSearchPath, new DataConfigurationFilter());
    + *
    + * if (cacheNames == null || cacheNames.length == 0)
    + * {
    + * // No data configuration files found in the FileStore.
    + * return;
    + * }
    + * 
    + * 
    + *
    + * + + *

    + * Example 9: Creating WorldWind Components from Data Configuration Documents + *

    + *
    + * 
    + * // Given a data configuration document which describes tiled imagery or tiled elevations in the WorldWind
    + * // FileStore, create a WorldWind Layer or ElevationModel according to the contents of the data configuration
    + * // document. This code is backward compatible with DataDescriptor files if the data configuration file was opened as
    + * // shown in Example 5 or Example 8.
    + * Document dataConfigDoc = ...;
    + * AVList params = ...;
    + * String filename = ...; // The data configuration's filename, relative to a WorldWind file store.
    + *
    + * // If the data configuration doesn't define a cache name, then compute one using the file's path relative to its
    + * // file store directory.
    + * String s = dataConfig.getString("DataCacheName");
    + * if (s == null || s.length() == 0)
    + * DataConfigurationUtils.getDataConfigCacheName(filename, params);
    + *
    + * String type = DataConfigurationUtils.getDataConfigType(domElement);
    + * if (type != null && type.equalsIgnoreCase("Layer"))
    + * {
    + * Factory factory = (Factory) WorldWind.createConfigurationComponent(AVKey.LAYER_FACTORY);
    + * Layer layer = (Layer) factory.createFromConfigSource(dataConfig, params);
    + * }
    + * else if (type != null && type.equalsIgnoreCase("ElevationModel"))
    + * {
    + * // If the data configuration doesn't define the data's extreme elevations, provide default values using the
    + * // minimum and maximum elevations of Earth.
    + * if (dataConfig.getDouble("ExtremeElevations/@min") == null)
    + * params.setValue(AVKey.ELEVATION_MIN, Earth.ELEVATION_MIN);
    + * if (dataConfig.getDouble("ExtremeElevations/@max") == null)
    + * params.setValue(AVKey.ELEVATION_MAX, Earth.ELEVATION_MAX); // Height of Mt. Everest.
    + * Factory factory = (Factory) WorldWind.createConfigurationComponent(AVKey.ELEVATION_MODEL_FACTORY);
    + * ElevationModel elevationModel = (ElevationModel) factory.createFromConfigSource(dataConfig, params);
    + * }
    + * else
    + * {
    + * // Currently, WorldWind supports factory construction of Layers and ElevationModels from data configuration
    + * // documents. If your data configuration document describes another type of component, you'll need to write your
    + * // own construction routine. Use BasicLayerFactory and BasicElevationModelFactory as references.
    + * return;
    + * }
    + * 
    + * 
    + *
    + * + + * + * + * +

    DataDescriptor Porting Guide

    + * DataDescriptor has been replaced with data configuration documents. This guide explains why DataDescriptor has been + * replaced, provides information on backward compatability with data configuration, and outlines how to update code + * which uses DataDescriptor. + * + *

    + * What Happened to DataDescriptor? + *
    + * Older versions of the gov.nasa.worldwind.data package included the DataDescriptor interface, along with its + * associated DataDescriptorReader and DataDescriptorWriter. DataDescriptor defined an interface and an XML file format + * for representing meta information about WorldWind cache data. The XML files were called "data descriptor" files, and + * were typically named "dataDescriptor.xml". Applications used these files to discover processed data in the World Wind + * file store, create an in-memory DataDescriptor from the file, then create either a Layer or an ElevationModel from + * the DataDescriptor. WorldWind needed a common mechanism to describe a component's configuration, but DataDescriptor + * had two problems which prevented its use as a common mechanism: (1) it presented all information as a flat list of + * key-value pairs, making it difficult to represent heirarchical information, and (2) it decoded complex properties + * (for example lists, angles, colors) at read time based on the property name, making it impossible to decode complex + * objects with unknown names. For these reasons DataDescriptor was replaced with data configuration documents. Data + * configuration documents provide a standard XML document structure to describe a component's configuration. They + * support heirarchical data, and enable data to be decoded after read time by any component which consumes the data + * configuration document. + * + *

    + * Backward Compatibility with Data Configuration Documents + *
    + * Data configuration documents have supporting utilities which are designed to read and transform DataDescriptor files + * written by older versions of WorldWind. Applications which port usage of DataDescriptor to data configuration + * documents can maintain backwards compatibility with the DataDescriptor files written by older versions of World Wind. + * However, there is no mechanism for forward compatibililty with data configuration documents. Applications which still + * use DataDescriptor files will not be able to recognize or read data configuration files. + * + *

    + * The section Common Use Case Examples provides usage examples of data + * configuration which are backward compatible with DataDescriptor. Example 4 and + * Example 5 demonstrate how to read both data configuration files and DataDescriptor files. + * Example 7 and Example 8 demonstrate how to search for data + * configuration files and DataDescriptor files in the file system or the WorldWind FileStore. + * Example 9 demonstrates how to create a WorldWind Layer or ElevationModel from a data + * configuration file, in a way which is backward compatible with DataDescriptor files. + *

    + * The data configuration files created in Example 1, Example 2, and + * Example 3 are not forward compatible with DataDescriptor. Likewise, neither are the data + * configuration files written in Example 6. Applications which still use DataDescriptor will + * not be able to recognize or read these files. + * + *

    + * Updating Usage of DataDescriptor + *
    + * Data configuration documents are designed to replace DataDescriptor as a mechanism for communicating configuration + * metadata about WorldWind components. WorldWind provides utilities to read and write data configuration files, search + * for data configuration files in the local file system or WorldWind file store, and create WorldWind components from a + * data configuration document. The following section outlines how to replace usage of DataDescriptor with data + * configuration files. + *

      + *
    • Reading DataDescriptor Files from the File System + *
      + * The following code snippet is an example of how DataDescriptorReader was used to open a DataDescriptor file from the + * local file system. Example 4 and Example 5 show how to replace this + * with usage of data configuration documents. + *
      + *
      + * 
      + * // Given a string path to a DataDescriptor file in the local file system, read the file as a DataDescriptor.
      + * String dataDescriptorPath = ...;
      + * DataDescriptorReader reader = new BasicDataDescriptorReader();
      + * reader.setSource(new File(dataDescriptorPath));
      + *
      + * if (!reader.canRead())
      + * {
      + * // File path does not point to a DataDescriptor file.
      + * return;
      + * }
      + *
      + * DataDescriptor dataDescriptor = reader.read();
      + * 
      + * 
      + *
      + *
    • + *
    • Writing DataDescriptor Files + *
      + * The following code snippet is an example of how DataDescriptorWriter was used to save a DataDescriptor to the local + * file system. Example 6 shows how to replace this with usage of data configuration documents. + *
      + *
      + * 
      + * // Given a path to the DataDescriptor file's destination in the local file system, and a parameter list
      + * // describing the data, create a DataDescriptor and write it to the file system.
      + * String dataDescriptorPath = ...;
      + * AVList params = ...;
      + * DataDescriptor descriptor = new BasicDataDescriptor();
      + *
      + * Object o = params.getValue(AVKey.FILE_STORE_LOCATION);
      + * if (o != null)
      + * descriptor.setFileStoreLocation(new java.io.File(o.toString()));
      + *
      + * o = params.getValue(AVKey.DATA_CACHE_NAME);
      + * if (o != null)
      + * descriptor.setFileStorePath(o.toString());
      + *
      + * o = params.getValue(AVKey.DATASET_NAME);
      + * if (o != null)
      + * descriptor.setName(o.toString());
      + *
      + * o = params.getValue(AVKey.DATA_TYPE);
      + * if (o != null)
      + * descriptor.setType(o.toString());
      + *
      + * for (java.util.Map.Entry<String, Object> avp : params.getEntries())
      + * {
      + * String key = avp.getKey();
      + * // Skip key-value pairs that the DataDescriptor specially manages.
      + * if (key.equals(AVKey.FILE_STORE_LOCATION)
      + * || key.equals(AVKey.DATA_CACHE_NAME)
      + * || key.equals(AVKey.DATASET_NAME)
      + * || key.equals(AVKey.DATA_TYPE))
      + * {
      + * continue;
      + * }
      + *
      + * descriptor.setValue(key, avp.getValue());
      + * }
      + *
      + * DataDescriptorWriter writer = new BasicDataDescriptorWriter();
      + * writer.setDestination(installLocation);
      + * writer.write(descriptor);
      + * 
      + * 
      + *
      + *
    • + *
    • Searching for DataDescriptor Files in the WorldWind FileStore + *
      + * The following code snippet is an example of how FileStore.findDataDescriptors was used to search for DataDescriptor + * files in the WorldWind FileStore. Example 8 shows how to replace this with usage of data + * configuration documents. + *
      + *
      + * 
      + * // Given a WorldWind FileStore location in which to look for DataDescriptor files, return a list of cache names
      + * // representing the matches closest to the root: DataDescriptor files who's ancestor directories contain another
      + * // DataDescriptor file are ignored. The search location must not be null.
      + * String fileStoreLocation = ...;
      + * FileStore fileStore = ...;
      + * List<? extends DataDescriptor> dataDescriptors = fileStore.findDataDescriptors(fileStoreLocation);
      + *
      + * if (dataDescriptors == null || dataDescriptors.size() == 0)
      + * {
      + * // No DataDescriptor files found in the specified FileStore location.
      + * return;
      + * }
      + * 
      + * 
      + *
      + *
    • + *
    • Creating WorldWind Components from DataDescriptor + *
      + * The following code snippet is an example of how the AVList parameters attached to DataDescriptor were used to + * construct WorldWind Layers and ElevationModels. Example 9 shows how to replace this with + * usage of data configuration documents. + *
      + *
      + * 
      + * // Given a reference to a DataDescriptor which describes tiled imagery or elevations in the WorldWind
      + * // FileStore, create a WorldWind Layer or ElevationModel according to the contents of the DataDescriptor.
      + * DataDescriptor dataDescriptor = ...;
      + *
      + * if (dataDescriptor.getType().equals(AVKey.TILED_IMAGERY))
      + * {
      + * BasicTiledImageLayer layer = new BasicTiledImageLayer(dataDescriptor);
      + * layer.setNetworkRetrievalEnabled(false);
      + * layer.setUseTransparentTextures(true);
      + * if (dataDescriptor.getName() != null)
      + * {
      + * layer.setName(dataDescriptor.getName());
      + * }
      + * }
      + * else if (dataDescriptor.getType().equals(AVKey.TILED_ELEVATIONS))
      + * {
      + * // DataDescriptor files do not contain properties describing an ElevationModel's extreme elevations. Give
      + * // those properties default values using the known extreme elevations on Earth.
      + * dataDescriptor.setValue(AVKey.ELEVATION_MIN, Earth.ELEVATION_MIN);
      + * dataDescriptor.setValue(AVKey.ELEVATION_MAX, Earth.ELEVATION_MAX);
      + *
      + * // DataDescriptor files contain the property key "gov.nasa.worldwind.avkey.MissingDataValue", which must be
      + * // translated to AVKey.MISSING_DATA_SIGNAL so it will be understood by BasicElevationModel.
      + * if (dataDescriptor.hasKey("gov.nasa.worldwind.avkey.MissingDataValue"))
      + * {
      + * Object missingDataSignal = dataDescriptor.getValue("gov.nasa.worldwind.avkey.MissingDataValue");
      + * dataDescriptor.removeKey("gov.nasa.worldwind.avkey.MissingDataValue");
      + * dataDescriptor.setValue(AVKey.MISSING_DATA_SIGNAL, missingDataSignal);
      + * }
      + *
      + * BasicElevationModel elevationModel = new BasicElevationModel(dataDescriptor);
      + * elevationModel.setNetworkRetrievalEnabled(false);
      + * if (dataDescriptor.getName() != null)
      + * {
      + * elevationModel.setName(dataDescriptor.getName());
      + * }
      + * }
      + * 
      + * 
      + *
      + *
    • + *
    + * + * + */ +package gov.nasa.worldwind.data; diff --git a/src/gov/nasa/worldwind/data/package.html b/src/gov/nasa/worldwind/data/package.html deleted file mode 100644 index 25431e1f49..0000000000 --- a/src/gov/nasa/worldwind/data/package.html +++ /dev/null @@ -1,805 +0,0 @@ - - - - - - - - Package gov.nasa.worldwind.data Description - - - -

    - This package provides classes for converting raw data sources into a form which can be used by standard World Wind - components, such as {@link gov.nasa.worldwind.layers.Layer} and {@link gov.nasa.worldwind.globes.ElevationModel}. - The gov.nasa.worldwind.data package contains two key interfaces: DataRaster, and DataStoreProducer. Older versions - of the gov.nasa.worldwind.data package included DataDescriptor, which has been removed from World Wind. This section - describes the role of each interface. A guide to updating code which uses DataDescriptor can be found - here. - -

    - {@link gov.nasa.worldwind.data.DataRaster} encapsulates the dimensions, geographic - {@link gov.nasa.worldwind.geom.Sector}, and data of a two-dimensional raster grid. DataRaster provides an interface - to draw one geographic raster into another, according to each raster's geographic bounds. There are three - concrete implementations of DataRaster: -

      -
    • {@link gov.nasa.worldwind.data.BufferedImageRaster} - uses a {@link java.awt.image.BufferedImage} as a source of - geographically referenced image data.
    • -
    • {@link gov.nasa.worldwind.data.BufferWrapperRaster} - uses a {@link gov.nasa.worldwind.util.BufferWrapper} as a - source of geographically referenced scalar data. BufferWrapperRaster typically represents integer or floating - point elevation data.
    • -
    • {@link gov.nasa.worldwind.data.CachedDataRaster} - a wrapper implementation of DataRaster which lazily loads a - DataRaster from a specified source. The lazily loaded DataRaster is kept in a - {@link gov.nasa.worldwind.cache.MemoryCache}, which can be shared across multiple CachedDataRasters. - CachedDataRaster is useful when an application needs to operate on a number of raster data sources which do - not fit into main memory.
    • -
    - Additionally, there are two interfaces for performing I/O operations on DataRaster: -
      -
    • {@link gov.nasa.worldwind.data.DataRasterReader} - implementations can read image formats accepted by - {@link javax.imageio.ImageIO}, GeoTIFF images, GeoTIFF elevations, Raster Product Format (RPF) imagery, and Band - Interleaved by Line (BIL) formatted data.
    • -
    • {@link gov.nasa.worldwind.data.DataRasterWriter} - implementations can write image formats accepted by ImageIO, - GeoTIFF images, GeoTIFF elevations, compressed Direct Draw Surface (DDS) images, and Band Interleaved by Line - (BIL) formatted data.
    • -
    - -

    - {@link gov.nasa.worldwind.data.DataStoreProducer} provides a common interface for converting raw data sources into a - form which can be used by standard World Wind components. There are three concrete implementations of - DataStoreProducer: -

      -
    • {@link gov.nasa.worldwind.data.TiledElevationProducer} - converts georeferenced image files into the World Wind - tile cache structure, which can be rendered on the globe by a {@link gov.nasa.worldwind.layers.TiledImageLayer}. -
    • -
    • {@link gov.nasa.worldwind.data.TiledImageProducer} - converts georeferenced elevation data files into the World - Wind tile cache structure, which can become part of the globe's surface terrain by using a - {@link gov.nasa.worldwind.terrain.BasicElevationModel}.
    • -
    • {@link gov.nasa.worldwind.data.WWDotNetLayerSetConverter} - converts data in the World Wind .NET tile cache - structure into the World Wind Java tile cache structure.
    • -
    - -

    - Data Configuration Documents are a common mechanism and file format for describing a World Wind - component's configuration. While data configuration documents are not part of the gov.nasa.worldwind.data package, - they are used as a configuration exchange mechanism by the classes in gov.nasa.worldwind.data. For example, - DataStoreProducer returns a DOM Document describing the data it produces. Understanding how to use data - configuration documents is important to leveraging the functionality of the gov.nasa.worldwind.data package. The - section Common Use Case Examples provides examples of how to use data - configuration documents to manage the data produced by classes in this package. - -

    - DataDescriptor defined an interface for representing meta information about World Wind cache data. - It has been replaced with data configuration documents, which provide a common mechanism to describe a component's - configuration. For information how to update code which uses DataDescriptor, see the - DataDescriptor Porting Guide. - - - - - -

    Supported Formats

    -
      -
    • ADF - A proprietary BINARY format developed by ESRI for ARC/INFO GRID rasters stored in workspaces (INFO - directory, *.adf) -
    • -
    • ADRG - ARC Digitized Raster Graphics format; requires General Information File and Image file (*.gen + *.img) -
    • -
    • AirSAR - AirSAR Polarimetric (POLSAR) data format; images in P,L,C-wavelengths only (*.dat OR *_[p|l|c].dat) -
    • -
    • ASC - A non-proprietary ASCII format developed by ESRI for ARC/INFO rasters in ASCII format (*.asc, *.grd)
    • -
    • BAS - Fuji BAS Scanner Image (*.bas)
    • -
    • BIL - Band Interleaved by Line format of satellite data rasters, must be .HDR labeled (*.bil)
    • -
    • BIP - Band Interleaved by Pixel format of satellite data rasters, must be .HDR labeled (*.bip)
    • -
    • BLX - Magellan designed format for storing topographic data in Magellan GPS units (*.blx)
    • -
    • BMP - Microsoft Windows Device Independent Bitmap for raster graphics images, color and monochrome (*.bmp)
    • -
    • CADRG - Compressed ARC Digitized Raster Graphics format for digital maps and chart images, RPF and NITFS - compliant -
    • -
    • CIB - Controlled Image Base format for ortho-photos (rectified grayscale aerial images), RPF and NITFS compliant -
    • -
    • COASP - Defence R&D Canada (DRDC) designed data raster format for Configurable Airborne SAR Processor (*.coasp) -
    • -
    • COSAR - "COmplex SAR", Annotated Binary Matrix (TerraSAR-X), plain binary image raster, limited to 4GB size - (*.cosar) -
    • -
    • DEM - USGS designed format for storing a raster-based Digital Elevation Model (*.dem)
    • -
    • DOQ - USGS designed Digital Ortho Quad format for projections and transformations (*.doq)
    • -
    • DTED - Digital Terrain Elevation Data format for regularly spaced grid of elevation points (*.dt0, *.dt1, *.dt2) -
    • -
    • ENVI - ENVI raster types of 1bit, 2bit, 4bit, or 8bit, Int16, Float32 , limited support for projections and - datums(*.nvi + *.hdr) -
    • -
    • ESRI - ESRI raw raster data (aka ESRI BIL format) types of 8bit,16bit, and 32bit integers (*.bil + *.hdr)
    • -
    • GFF - Ground-based SAR Applications Testbed File Format (.gff)
    • -
    • GIF - CompuServe designed Graphics Interchange Format, up to 8bits per pixel, LWZ compressed (*.gif)
    • -
    • GRC - Northwood/Vertical Mapper Classified Grid Format (*.grc , *.tab)
    • -
    • GRD - Golden Software ASCII Grid (GSAG), Binary Grid (GSBG) and Golden Software 7 Binary Grid (GS7BG) (*.grd) -
    • -
    • GRD - Northwood/Vertical Mapper Numeric Grid Format (*.grd , *.tab)
    • -
    • GXF - GeoSoft Grid Exchange Format is an ASCII grid format for storing elevation data (*.gxf)
    • -
    • HGT - height format file for unprocessed global SRTM elevation data of 1x1 degree tiles (*.hgt or *.hgt.zip) -
    • -
    • ILWIS - ILWIS Raster Maps (*.mpr) and MapLists (*.mpl); projection info stored in the .CSY, georeference info - in the .GRF -
    • -
    • ISIS - USGS Astrogeology ISIS file format, versions 2 and 3 (*.isis)
    • -
    • JDEM - Japanese Digital Elevation Model for 32bit floating point elevation raster (*.mem)
    • -
    • JP2 - Joint Photographic Experts Group format based on wavelet compression (*.jp2, *.jp2k)
    • -
    • JPEG - Joint Photographic Experts Group format for images, uses lossy Digital Cosine Transform (DCT) compression - (*.jpg, *.jpeg) -
    • -
    • LCP - FARSITE v.4 Landscape multi-band raster format for terrain and tree canopy data; Int16 only; no projection - info, mostly UTM (.lcp) -
    • -
    • MFF - Vexcel MFF Raster (*.mff) and MFF2 (HKV) Raster (*.hdr)
    • -
    • MrSID - LizardTech's Multi-resolution Seamless Image Database file format based on wavelet compression (*.sid) -
    • -
    • NAT - Meteosat Second Generation (MSG) Native Archive Format, supports up to 12 bands, 10bits per band (.nat) -
    • -
    • NITF - National Imagery Transmission Format for the exchange, storage, and transmission of digital documents - (*.ntf, *.nitf) -
    • -
    • PCI - A database file format developed by PCI Geomatics for EASI/PACE remote sensing software (uncompressed - *.pix and *.pcidsk) -
    • -
    • PGM - Netpbm grayscale image format (Portable Graymap) (*.pgm)
    • -
    • PNG - Portable Network Graphics format for grayscale, palette-based, and RGB-only images, lossless data - compression, supports transparency (*.png) -
    • -
    • PPM - Netpbm color image format (Portable Pixmap) (*.ppm)
    • -
    • RDB - R Raster Data (*.asc, *.rdb)
    • -
    • RIK - Swedish Grid RIK format for maps issued by the Swedish organization Lantmäteriet (*.rik)
    • -
    • RPF - Raster Product Formats for digital images (CIB), maps and charts (CADRG), NITFS compliant (A.TOC)
    • -
    • SDAT - SAGA (System for Automated Geoscientific Analyses) GIS Binary Grid (binary dataset in *.sdat, ASCII - header in *.sgrd) -
    • -
    • TER - Leveller heightfields file format to store a one band of Float32 elevation values (*.ter)
    • -
    • TER - Terragen terrain file format to store a one band of Int16 elevation values (*.ter, *.terrain)
    • -
    • TIFF - Tagged Image File Format (TIFF) and GeoTIFF (*.tif, *.tiff, *.gtif)
    • - -
    • AirSAR, AirSAR Polarimetric Image, AirSAR
    • -
    • BT, VTP .bt (Binary Terrain) 1.3 Format, BT
    • -
    • CEOS, CEOS Image, CEOS
    • -
    • COASP, DRDC COASP SAR Processor Raster, COASP
    • -
    • COSAR, COSAR Annotated Binary Matrix (TerraSAR-X), COSAR
    • -
    • CPG, Convair PolGASP, CPG
    • -
    • DIMAP, SPOT DIMAP, DIMAP
    • -
    • DIPEx, DIPEx, DIPEx
    • -
    • EHdr, ESRI .hdr Labelled, EHdr
    • -
    • EIR, Erdas Imagine Raw, EIR
    • -
    • ELAS, ELAS, ELAS
    • -
    • ENVI, ENVI .hdr Labelled, ENVI
    • -
    • ERS, ERMapper .ers Labelled, ERS
    • -
    • ESAT, Envisat Image Format, ESAT
    • -
    • FAST, EOSAT FAST Format, FAST
    • -
    • FIT, FIT Image, FIT
    • -
    • FujiBAS, Fuji BAS Scanner Image, FujiBAS
    • -
    • GenBin, Generic Binary (.hdr Labelled), GenBin
    • -
    • GSC, GSC Geogrid, GSC
    • - -
    • HFA, Erdas Imagine Images (.img)A
    • -
    • IDA, Image Data and Analysis, IDA
    • -
    • ILWIS, ILWIS Raster Map, ILWIS
    • -
    • INGR, Intergraph Raster, INGR
    • -
    • JAXAPALSAR, JAXA PALSAR Product Reader (Level 1.1/1.5), JAXAPALSAR
    • -
    • L1B, NOAA Polar Orbiter Level 1b Data Set, L1B
    • -
    • LAN, Erdas .LAN/.GIS, LAN
    • -
    • LCP, FARSITE v.4 Landscape File (.lcp), LCP
    • -
    • MEM, In Memory Raster, MEM
    • -
    • MSGN, EUMETSAT Archive native (.nat), MSGN
    • -
    • NDF, NLAPS Data Format, NDF
    • -
    • PAux, PCI .aux Labelled, PAux
    • -
    • PCIDSK, PCIDSK Database File, PCIDSK
    • -
    • PDS, NASA Planetary Data System, PDS
    • - -
    • RMF, Raster Matrix Format, RMF
    • -
    • RS2, RadarSat 2 XML Product, RS2
    • -
    • RST, Idrisi Raster A.1, RST
    • -
    • SAGA, SAGA GIS Binary Grid (.sdat), SAGA
    • -
    • SAR_CEOS, CEOS SAR Image, SAR_CEOS
    • -
    • SDTS, SDTS Raster, SDTS
    • -
    • SGI, SGI Image File Format 1.0, SGI
    • -
    • SRP, Standard Raster Product (ASRP/USRP), SRP
    • -
    • TIL, EarthWatch .TIL, TIL
    • -
    • TSX, TerraSAR-X Product, TSX
    • -
    • XPM, X11 PixMap Format, XPM
    • - -
    - - - - - -

    Supported Projections

    -
      -
    • Albers Equal-Area Conic
    • -
    • Azimuthal Equidistant
    • -
    • Cassini-Soldner
    • -
    • Cylindrical Equal Area
    • -
    • Eckert IV
    • -
    • Eckert VI
    • -
    • Equidistant Conic
    • -
    • Equidistant Cylindrical
    • -
    • Equirectangular
    • -
    • Gauss-Kruger
    • -
    • Gall Stereographic
    • -
    • GEOS - Geostationary Satellite View -
    • Gnomonic
    • -
    • Hotine Oblique Mercator
    • -
    • Krovak
    • -
    • Laborde Oblique Mercator
    • -
    • Lambert Azimuthal Equal Area
    • -
    • Lambert Conic Conformal (1SP)
    • -
    • Lambert Conic Conformal (2SP)
    • -
    • Lambert Conic Conformal (2SP Belgium)
    • -
    • Lambert Cylindrical Equal Area
    • -
    • Mercator (1SP)
    • -
    • Mercator (2SP)
    • -
    • Miller Cylindrical
    • -
    • Mollweide
    • -
    • New Zealand Map Grid
    • -
    • Oblique Mercator
    • -
    • Oblique Stereographic
    • -
    • Orthographic
    • -
    • Polar Stereographic
    • -
    • Polyconic
    • -
    • Robinson
    • -
    • Rosenmund Oblique Mercator
    • -
    • Sinusoidal
    • -
    • Swiss Oblique Cylindrical
    • -
    • Swiss Oblique Mercator
    • -
    • Stereographic
    • -
    • Transverse Mercator
    • -
    • Transverse Mercator (Modified Alaska)
    • -
    • Transverse Mercator (South Oriented)
    • -
    • Tunisia Mining Grid
    • -
    • VanDerGrinten
    • -
    - - - - - -

    Deploying World Wind's GDAL Libraries

    - - The open-source GDAL and PROJ4 libraries are used to import many of World Wind's supported data formats. World Wind - uses GDAL version 1.7.2 and PROJ4 version ?.? along with LizardTech's Decode SDK version 7.0.0.2167 for MrSID - support. - - -

    Supported Platforms

    - - GDAL and PROJ4 have been incorporated for MacOSX (Snow Leopard, 64-bit), Windows 32 and Windows 64. Support for - Linux 32-bit and 64-bit, and Solaris are expected in the very near future. If the GDAL library cannot be found, data - import operates without it but supports only a limited set of formats and projections, in particular, GeoTIFF, JPEG, - PNG, BIL and DTED, and either EPSG:4326f (WGS84, latitude/longitude), or UTM. - -

    GDAL Library Locations

    - - To simplify deployment, GDAL + PRO4 + MrSID bundles are provided as a single dynamic library with all dependent - libraries included. There is one such library per platform, each located in - lib-external/gdal/platform, as follows: -
      -
    • Windows 32bit library gdalalljni.dll is located in lib-external/gdal/win32/
    • -
    • Windows 64bit library gdalalljni.dll is located in lib-external/gdal/win64/
    • -
    • Mac OSX library libgdalalljni.jnilib is in lib-external/gdal/macosx/
    • -
    - The GDAL and PROJ4 libraries require data tables located in lib-external/gdal/data. World Wind attempts - to locate GDAL libraries during startup. By default World Wind will first look in the locations listed above, then - in the current path, and if no GDAL bundle was found, will try to locate the GDAL bundle in the sub-folders. - - -

    Deploying with Java Web Start

    - - Instructions for using the World Wind GDAL libraries with a Java Web Start application are available at - http://goworldwind.org/getting-started/. - - - - - -

    Common Use Case Examples

    - - The following examples demonstrate the most common use cases which the classes in gov.nasa.worldwind.data are - designed to address. Additionally, several examples demonstrate data management use cases using data configuration - documents. These examples constitute an overview of how to convert raw data sources into a form which can be - consumed by World Wind components, then manage the data in its converted form. - - -

    - Example 1: Converting Georeferenced Imagery to the World Wind Tile Structure - -

    -
    -    
    -    // Given a source image, and a path to a folder in the local file system which receives the image tiles, configure a
    -    // TiledImageProducer to create a pyramid of images tiles in the World Wind Java cache format.
    -    String imagePath = ...;
    -    String tiledImagePath = ...;
    -    String tiledImageDisplayName = ...;
    -
    -    // Create a parameter list which defines where the image is imported, and the name associated with it.
    -    AVList params = new AVListImpl();
    -    params.setValue(AVKey.FILE_STORE_LOCATION, WWIO.getParentFilePath(tiledImagePath));
    -    params.setValue(AVKey.DATA_CACHE_NAME, WWIO.getFilename(tiledImagePath));
    -    params.setValue(AVKey.DATASET_NAME, tiledImageDisplayName);
    -
    -    // Create a TiledImageProducer to transform the source image to a pyramid of images tiles in the World Wind
    -    // Java cache format.
    -    DataStoreProducer producer = new TiledImageProducer();
    -    try
    -    {
    -        // Configure the TiledImageProducer with the parameter list and the image source.
    -        producer.setStoreParameters(params);
    -        producer.offerDataSource(new File(imagePath), null);
    -        // Import the source image into the FileStore by converting it to the World Wind Java cache format. This throws
    -        // an exception if production fails for any reason.
    -        producer.startProduction();
    -    }
    -    catch (Exception e)
    -    {
    -        // Exception attempting to create the image tiles. Revert any change made during production.
    -        producer.removeProductionState();
    -    }
    -
    -    // Extract the data configuration document from the production results. If production sucessfully completed, the
    -    // TiledImageProducer's production results contain a Document describing the converted imagery as a data
    -    // configuration document.
    -    Iterable results = producer.getProductionResults();
    -    if (results == null || results.iterator() == null || !results.iterator().hasNext())
    -        return;
    -
    -    Object o = results.iterator().next();
    -    if (o == null || !(o instanceof Document))
    -        return;
    -
    -    Document dataConfigDoc = (Document) o;
    -    
    -    
    -
    - - -

    - Example 2: Converting Georeferenced Elevation Data to the World Wind Tile Structure - -

    - Converting georeferenced elevation data can be accomplished by referring to - Example 1: Converting Georeferenced Imagery to the World Wind Tile Structure, and replacing - {@link gov.nasa.worldwind.data.TiledImageProducer} with {@link gov.nasa.worldwind.data.TiledElevationProducer}. -
    - - -

    - Example 3: Converting World Wind .NET LayerSets to the World Wind Java Tile Structure - -

    - Converting World Wind .NET LayerSets can be accomplished by referring to - Example 1: Converting Georeferenced Imagery to the World Wind Tile Structure, and replacing - {@link gov.nasa.worldwind.data.TiledImageProducer} with {@link gov.nasa.worldwind.data.WWDotNetLayerSetConverter}. -
    - - -

    - Example 4: Reading Data Configuration Documents from the File System -

    -
    -    
    -    // Given a string path to a data configuration file in the local file system, read the file as a DOM document, which
    -    // can be consumed by World Wind's Layer and ElevationModel factories. This code is backward compatible with
    -    // DataDescriptor files. The method DataConfigurationUtils.convertToStandardDataConfigDocument automatically detects
    -    // and transforms DataDescriptor documents into standard Layer and ElevationModel configuration documents.
    -    String dataConfigPath = ...;
    -    Document dataConfigDoc = WWXML.openDocument(dataConfigPath);
    -    dataConfigDoc = DataConfigurationUtils.convertToStandardDataConfigDocument(dataConfigDoc);
    -    
    -    
    -
    - - -

    - Example 5: Reading Data Configuration Documents from the World Wind FileStore - -

    -
    -    
    -    // Given a path to a data configuration file in the World Wind FileStore, read the file as a DOM document, which can
    -    // be consumed by World Wind's Layer and ElevationModel factories. This code is backward compatible with
    -    // DataDescriptor files. The method DataConfigurationUtils.convertToStandardDataConfigDocument automatically detects
    -    // and transforms DataDescriptor documents into standard Layer or ElevationModel configuration documents.
    -    FileStore fileStore = ...;
    -    String dataConfigPath = ...;
    -
    -    // Look for the data configuration file in the local file cache, but not in the class path.
    -    URL url = fileStore.findFile(dataConfigPath, false);
    -    if (url == null)
    -    {
    -        // The specified path name does not exist in the file store.
    -        return;
    -    }
    -
    -    Document dataConfigDoc = WWXML.openDocument(url);
    -    dataConfigDoc = DataConfigurationUtils.convertToStandardDataConfigDocument(dataConfigDoc);
    -    
    -    
    -
    - - -

    - Example 6: Writing Data Configuration Documents -

    -
    -    
    -    // Given a path to the data configuration file's destination in the local file system, and a parameter list
    -    // describing the data, create a standard data configuration document and write it to the file system. This code is
    -    // not forward compatible with applications still using DataDescriptor. Code which uses
    -    // FileStore.findDataDescriptors to find data configuration files, or DataDesccriptorReader to read data
    -    // configuration files will not be able to find or read the file produced by this example.
    -    String dataConfigPath = ...;
    -    AVList params = ...;
    -
    -    // Create a data configuration document from the specified parameters.
    -    Document dataConfigDoc;
    -    if (isTiledImageryData)
    -    {
    -        // If you're writing a data configuration file for tiled imagery, use the following:
    -        dataConfigDoc = LayerConfiguration.createTiledImageLayerDocument(params);
    -    }
    -    else if (isTiledElevationData)
    -    {
    -        // If you're writing a data configuration file for tiled elevations, use the following:
    -        dataConfigDoc = ElevationModelConfiguration.createBasicElevationModelDocument(params);
    -    }
    -    else
    -    {
    -        // Otherwise, you'll need to create your own document. World Wind currently provides support for creating data
    -        // configuration files for tiled imagery and tiled elevations. Write custom code to create a data configuration
    -        // document which corresponds with your data. Use LayerConfiguration and ElevationModelConfiguration as
    -        // references, and use the methods in WWXML to construct your document in memory.
    -    }
    -
    -    // Write the data configuration document to the file system.
    -    WWXML.saveDocumentToFile(dataConfigDoc, dataConfigPath);
    -    
    -    
    -
    - - -

    - Example 7: Searching for Data Configuration Documents in the File System -

    -
    -    
    -    // Given a search path in the local file system to look for data configuration files, return a list of file paths
    -    // representing the matches closest to the root: data configuration files who's ancestor directories contain another
    -    // data configuration file are ignored. The search path cannot be null. This code is backward compatible with
    -    // DataDescriptor files. The class DataConfigurationFilter accepts standard Layer and ElevationModel configuration
    -    // files, DataDescriptor files, and World Wind .NET LayerSet files.
    -    String searchPath = ...;
    -    String[] filePaths = WWIO.listDescendantFilenames(searchPath, new DataConfigurationFilter());
    -
    -    if (filePaths == null || filePaths.length == 0)
    -    {
    -        // No data configuration files found in the file system.
    -        return;
    -    }
    -    
    -    
    -
    - - -

    - Example 8: Searching for Data Configuration Documents in the World Wind FileStore - -

    - There are two methods of searching for data configuration files in the World Wind FileStore. The first method - individually searches each FileStore location using the method - {@link gov.nasa.worldwind.util.WWIO#listDescendantFilenames(java.io.File, java.io.FileFilter, boolean)}. This method - is equivalent to calling the method FileStore.findDataDescriptors(String) (which has been removed), and - should be used by applications porting from DataDescriptor. Use this method when your application needs to control - the FileStore locations it searches for data configuration files. -
    -    
    -    // Given a World Wind FileStore location in which to look for data configuration files, return a list of cache names
    -    // representing the matches closest to the root: data configuration files who's ancestor directories contain another
    -    // data configuration file are ignored. This code is backward compatible with DataDescriptor files. The class
    -    // DataConfigurationFilter accepts standard Layer and ElevationModel configuration files, DataDescriptor files, and
    -    // World Wind .NET LayerSet files.
    -    String fileStoreLocation = ...;
    -    String[] cacheNames = WWIO.listDescendantFilenames(fileStoreLocation, new DataConfigurationFilter(), false);
    -
    -    if (cacheNames == null || cacheNames.length == 0)
    -    {
    -        // No data configuration files found in the FileStore.
    -        return;
    -    }
    -    
    -    
    - The second method searches the entire World Wind FileStore under a relative file store path. Use this method when - your application doesn't care which FileStore location it searches for data configuration files, but may care what - relative file store path it searches under. -
    -    
    -    // Given a search path in the World Wind FileStore to look for data configuration files, return a list of cache
    -    // names representing the matches closest to the root: data configuration files who's ancestor directories contain
    -    // another data configuration file are ignored. If the search path is null, the method FileStore.listTopFileNames
    -    // searches the entire FileStore, excluding the class path. This code is backward compatible with DataDescriptor
    -    // files. The class DataConfigurationFilter accepts standard Layer and ElevationModel configuration files,
    -    // DataDescriptor files, and World Wind .NET LayerSet files.
    -    FileStore fileStore = ...;
    -    String fileStoreSearchPath = ...;
    -    String[] cacheNames = fileStore.listTopFileNames(fileStoreSearchPath, new DataConfigurationFilter());
    -
    -    if (cacheNames == null || cacheNames.length == 0)
    -    {
    -        // No data configuration files found in the FileStore.
    -        return;
    -    }
    -    
    -    
    -
    - - -

    - Example 9: Creating World Wind Components from Data Configuration Documents -

    -
    -    
    -    // Given a data configuration document which describes tiled imagery or tiled elevations in the World Wind
    -    // FileStore, create a World Wind Layer or ElevationModel according to the contents of the data configuration
    -    // document. This code is backward compatible with DataDescriptor files if the data configuration file was opened as
    -    // shown in Example 5 or Example 8.
    -    Document dataConfigDoc = ...;
    -    AVList params = ...;
    -    String filename = ...; // The data configuration's filename, relative to a World Wind file store.
    -
    -    // If the data configuration doesn't define a cache name, then compute one using the file's path relative to its
    -    // file store directory.
    -    String s = dataConfig.getString("DataCacheName");
    -    if (s == null || s.length() == 0)
    -        DataConfigurationUtils.getDataConfigCacheName(filename, params);
    -
    -    String type = DataConfigurationUtils.getDataConfigType(domElement);
    -    if (type != null && type.equalsIgnoreCase("Layer"))
    -    {
    -        Factory factory = (Factory) WorldWind.createConfigurationComponent(AVKey.LAYER_FACTORY);
    -        Layer layer = (Layer) factory.createFromConfigSource(dataConfig, params);
    -    }
    -    else if (type != null && type.equalsIgnoreCase("ElevationModel"))
    -    {
    -        // If the data configuration doesn't define the data's extreme elevations, provide default values using the
    -        // minimum and maximum elevations of Earth.
    -        if (dataConfig.getDouble("ExtremeElevations/@min") == null)
    -            params.setValue(AVKey.ELEVATION_MIN, Earth.ELEVATION_MIN);
    -        if (dataConfig.getDouble("ExtremeElevations/@max") == null)
    -            params.setValue(AVKey.ELEVATION_MAX, Earth.ELEVATION_MAX); // Height of Mt. Everest.
    -        Factory factory = (Factory) WorldWind.createConfigurationComponent(AVKey.ELEVATION_MODEL_FACTORY);
    -        ElevationModel elevationModel = (ElevationModel) factory.createFromConfigSource(dataConfig, params);
    -    }
    -    else
    -    {
    -        // Currently, World Wind supports factory construction of Layers and ElevationModels from data configuration
    -        // documents. If your data configuration document describes another type of component, you'll need to write your
    -        // own construction routine. Use BasicLayerFactory and BasicElevationModelFactory as references.
    -        return;
    -    }
    -    
    -    
    -
    - - - - - -

    DataDescriptor Porting Guide

    - DataDescriptor has been replaced with data configuration documents. This guide explains why DataDescriptor has been - replaced, provides information on backward compatability with data configuration, and outlines how to update code - which uses DataDescriptor. - -

    - What Happened to DataDescriptor? -
    - Older versions of the gov.nasa.worldwind.data package included the DataDescriptor interface, along with its - associated DataDescriptorReader and DataDescriptorWriter. DataDescriptor defined an interface and an XML file format - for representing meta information about World Wind cache data. The XML files were called "data descriptor" files, - and were typically named "dataDescriptor.xml". Applications used these files to discover processed data in the World - Wind file store, create an in-memory DataDescriptor from the file, then create either a Layer or an ElevationModel - from the DataDescriptor. World Wind needed a common mechanism to describe a component's configuration, but - DataDescriptor had two problems which prevented its use as a common mechanism: (1) it presented all information as a - flat list of key-value pairs, making it difficult to represent heirarchical information, and (2) it decoded complex - properties (for example lists, angles, colors) at read time based on the property name, making it impossible to - decode complex objects with unknown names. For these reasons DataDescriptor was replaced with data configuration - documents. Data configuration documents provide a standard XML document structure to describe a component's - configuration. They support heirarchical data, and enable data to be decoded after read time by any component which - consumes the data configuration document. - -

    - Backward Compatibility with Data Configuration Documents -
    - Data configuration documents have supporting utilities which are designed to read and transform DataDescriptor files - written by older versions of World Wind. Applications which port usage of DataDescriptor to data configuration - documents can maintain backwards compatibility with the DataDescriptor files written by older versions of World - Wind. However, there is no mechanism for forward compatibililty with data configuration documents. Applications - which still use DataDescriptor files will not be able to recognize or read data configuration files. - -

    - The section Common Use Case Examples provides usage examples of data - configuration which are backward compatible with DataDescriptor. Example 4 and - Example 5 demonstrate how to read both data configuration files and DataDescriptor files. - Example 7 and Example 8 demonstrate how to search for - data configuration files and DataDescriptor files in the file system or the World Wind FileStore. - Example 9 demonstrates how to create a World Wind Layer or ElevationModel from a - data configuration file, in a way which is backward compatible with DataDescriptor files. -

    - The data configuration files created in Example 1, Example 2, and - Example 3 are not forward compatible with DataDescriptor. Likewise, neither are the - data configuration files written in Example 6. Applications which still use DataDescriptor - will not be able to recognize or read these files. - -

    - Updating Usage of DataDescriptor -
    - Data configuration documents are designed to replace DataDescriptor as a mechanism for communicating configuration - metadata about World Wind components. World Wind provides utilities to read and write data configuration files, - search for data configuration files in the local file system or World Wind file store, and create World Wind - components from a data configuration document. The following section outlines how to replace usage of DataDescriptor - with data configuration files. -

      -
    • Reading DataDescriptor Files from the File System -
      - The following code snippet is an example of how DataDescriptorReader was used to open a DataDescriptor file from - the local file system. Example 4 and Example 5 show how to - replace this with usage of data configuration documents. -
      -
      -        
      -        // Given a string path to a DataDescriptor file in the local file system, read the file as a DataDescriptor.
      -        String dataDescriptorPath = ...;
      -        DataDescriptorReader reader = new BasicDataDescriptorReader();
      -        reader.setSource(new File(dataDescriptorPath));
      -
      -        if (!reader.canRead())
      -        {
      -            // File path does not point to a DataDescriptor file.
      -            return;
      -        }
      -
      -        DataDescriptor dataDescriptor = reader.read();
      -        
      -        
      -
      -
    • -
    • Writing DataDescriptor Files -
      - The following code snippet is an example of how DataDescriptorWriter was used to save a DataDescriptor to the - local file system. Example 6 shows how to replace this with usage of data configuration - documents. -
      -
      -        
      -        // Given a path to the DataDescriptor file's destination in the local file system, and a parameter list
      -        // describing the data, create a DataDescriptor and write it to the file system.
      -        String dataDescriptorPath = ...;
      -        AVList params = ...;
      -        DataDescriptor descriptor = new BasicDataDescriptor();
      -
      -        Object o = params.getValue(AVKey.FILE_STORE_LOCATION);
      -        if (o != null)
      -            descriptor.setFileStoreLocation(new java.io.File(o.toString()));
      -
      -        o = params.getValue(AVKey.DATA_CACHE_NAME);
      -        if (o != null)
      -            descriptor.setFileStorePath(o.toString());
      -
      -        o = params.getValue(AVKey.DATASET_NAME);
      -        if (o != null)
      -            descriptor.setName(o.toString());
      -
      -        o = params.getValue(AVKey.DATA_TYPE);
      -        if (o != null)
      -            descriptor.setType(o.toString());
      -
      -        for (java.util.Map.Entry<String, Object> avp : params.getEntries())
      -        {
      -            String key = avp.getKey();
      -            // Skip key-value pairs that the DataDescriptor specially manages.
      -            if (key.equals(AVKey.FILE_STORE_LOCATION)
      -                || key.equals(AVKey.DATA_CACHE_NAME)
      -                || key.equals(AVKey.DATASET_NAME)
      -                || key.equals(AVKey.DATA_TYPE))
      -            {
      -                continue;
      -            }
      -
      -            descriptor.setValue(key, avp.getValue());
      -        }
      -
      -        DataDescriptorWriter writer = new BasicDataDescriptorWriter();
      -        writer.setDestination(installLocation);
      -        writer.write(descriptor);
      -        
      -        
      -
      -
    • -
    • Searching for DataDescriptor Files in the World Wind FileStore -
      - The following code snippet is an example of how FileStore.findDataDescriptors was used to search for - DataDescriptor files in the World Wind FileStore. Example 8 shows how to replace this - with usage of data configuration documents. -
      -
      -        
      -        // Given a World Wind FileStore location in which to look for DataDescriptor files, return a list of cache names
      -        // representing the matches closest to the root: DataDescriptor files who's ancestor directories contain another
      -        // DataDescriptor file are ignored. The search location must not be null.
      -        String fileStoreLocation = ...;
      -        FileStore fileStore = ...;
      -        List<? extends DataDescriptor> dataDescriptors = fileStore.findDataDescriptors(fileStoreLocation);
      -
      -        if (dataDescriptors == null || dataDescriptors.size() == 0)
      -        {
      -            // No DataDescriptor files found in the specified FileStore location.
      -            return;
      -        }
      -        
      -        
      -
      -
    • -
    • Creating World Wind Components from DataDescriptor -
      - The following code snippet is an example of how the AVList parameters attached to DataDescriptor were used to - construct World Wind Layers and ElevationModels. Example 9 shows how to replace this - with usage of data configuration documents. -
      -
      -        
      -        // Given a reference to a DataDescriptor which describes tiled imagery or elevations in the World Wind
      -        // FileStore, create a World Wind Layer or ElevationModel according to the contents of the DataDescriptor.
      -        DataDescriptor dataDescriptor = ...;
      -
      -        if (dataDescriptor.getType().equals(AVKey.TILED_IMAGERY))
      -        {
      -            BasicTiledImageLayer layer = new BasicTiledImageLayer(dataDescriptor);
      -            layer.setNetworkRetrievalEnabled(false);
      -            layer.setUseTransparentTextures(true);
      -            if (dataDescriptor.getName() != null)
      -            {
      -                layer.setName(dataDescriptor.getName());
      -            }
      -        }
      -        else if (dataDescriptor.getType().equals(AVKey.TILED_ELEVATIONS))
      -        {
      -            // DataDescriptor files do not contain properties describing an ElevationModel's extreme elevations. Give
      -            // those properties default values using the known extreme elevations on Earth.
      -            dataDescriptor.setValue(AVKey.ELEVATION_MIN, Earth.ELEVATION_MIN);
      -            dataDescriptor.setValue(AVKey.ELEVATION_MAX, Earth.ELEVATION_MAX);
      -
      -            // DataDescriptor files contain the property key "gov.nasa.worldwind.avkey.MissingDataValue", which must be
      -            // translated to AVKey.MISSING_DATA_SIGNAL so it will be understood by BasicElevationModel.
      -            if (dataDescriptor.hasKey("gov.nasa.worldwind.avkey.MissingDataValue"))
      -            {
      -                Object missingDataSignal = dataDescriptor.getValue("gov.nasa.worldwind.avkey.MissingDataValue");
      -                dataDescriptor.removeKey("gov.nasa.worldwind.avkey.MissingDataValue");
      -                dataDescriptor.setValue(AVKey.MISSING_DATA_SIGNAL, missingDataSignal);
      -            }
      -
      -            BasicElevationModel elevationModel = new BasicElevationModel(dataDescriptor);
      -            elevationModel.setNetworkRetrievalEnabled(false);
      -            if (dataDescriptor.getName() != null)
      -            {
      -                elevationModel.setName(dataDescriptor.getName());
      -            }
      -        }
      -        
      -        
      -
      -
    • -
    - - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/drag/DragContext.java b/src/gov/nasa/worldwind/drag/DragContext.java index 7aaee7d66f..6623902e88 100644 --- a/src/gov/nasa/worldwind/drag/DragContext.java +++ b/src/gov/nasa/worldwind/drag/DragContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2016 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.drag; diff --git a/src/gov/nasa/worldwind/drag/Draggable.java b/src/gov/nasa/worldwind/drag/Draggable.java index 0837745cc9..768310ecd1 100644 --- a/src/gov/nasa/worldwind/drag/Draggable.java +++ b/src/gov/nasa/worldwind/drag/Draggable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2016 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.drag; diff --git a/src/gov/nasa/worldwind/drag/DraggableSupport.java b/src/gov/nasa/worldwind/drag/DraggableSupport.java index e8caabcb57..3a5e7b52a5 100644 --- a/src/gov/nasa/worldwind/drag/DraggableSupport.java +++ b/src/gov/nasa/worldwind/drag/DraggableSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2016 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.drag; diff --git a/src/gov/nasa/worldwind/event/BulkRetrievalEvent.java b/src/gov/nasa/worldwind/event/BulkRetrievalEvent.java index 422764834a..3e317cf5ec 100644 --- a/src/gov/nasa/worldwind/event/BulkRetrievalEvent.java +++ b/src/gov/nasa/worldwind/event/BulkRetrievalEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/BulkRetrievalListener.java b/src/gov/nasa/worldwind/event/BulkRetrievalListener.java index 7b574a683c..5009fe0e98 100644 --- a/src/gov/nasa/worldwind/event/BulkRetrievalListener.java +++ b/src/gov/nasa/worldwind/event/BulkRetrievalListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/DragSelectEvent.java b/src/gov/nasa/worldwind/event/DragSelectEvent.java index a5469bbaa7..fcd36fe33a 100644 --- a/src/gov/nasa/worldwind/event/DragSelectEvent.java +++ b/src/gov/nasa/worldwind/event/DragSelectEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/InputHandler.java b/src/gov/nasa/worldwind/event/InputHandler.java index 874f5d20fe..b7705b1a01 100644 --- a/src/gov/nasa/worldwind/event/InputHandler.java +++ b/src/gov/nasa/worldwind/event/InputHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/Message.java b/src/gov/nasa/worldwind/event/Message.java index 03b280d957..146c46df8b 100644 --- a/src/gov/nasa/worldwind/event/Message.java +++ b/src/gov/nasa/worldwind/event/Message.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/MessageListener.java b/src/gov/nasa/worldwind/event/MessageListener.java index 57e5f0caa1..170dc19e15 100644 --- a/src/gov/nasa/worldwind/event/MessageListener.java +++ b/src/gov/nasa/worldwind/event/MessageListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/NoOpInputHandler.java b/src/gov/nasa/worldwind/event/NoOpInputHandler.java index c9529322db..6271407df7 100644 --- a/src/gov/nasa/worldwind/event/NoOpInputHandler.java +++ b/src/gov/nasa/worldwind/event/NoOpInputHandler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/PositionEvent.java b/src/gov/nasa/worldwind/event/PositionEvent.java index 1f8f0875e8..72a4e5b452 100644 --- a/src/gov/nasa/worldwind/event/PositionEvent.java +++ b/src/gov/nasa/worldwind/event/PositionEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/PositionListener.java b/src/gov/nasa/worldwind/event/PositionListener.java index 5e00cc24ba..b4f7290f89 100644 --- a/src/gov/nasa/worldwind/event/PositionListener.java +++ b/src/gov/nasa/worldwind/event/PositionListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/RenderingEvent.java b/src/gov/nasa/worldwind/event/RenderingEvent.java index 2b693884ec..ece5415e12 100644 --- a/src/gov/nasa/worldwind/event/RenderingEvent.java +++ b/src/gov/nasa/worldwind/event/RenderingEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/RenderingExceptionListener.java b/src/gov/nasa/worldwind/event/RenderingExceptionListener.java index f513c8a1c1..051c2e5e3f 100644 --- a/src/gov/nasa/worldwind/event/RenderingExceptionListener.java +++ b/src/gov/nasa/worldwind/event/RenderingExceptionListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/RenderingListener.java b/src/gov/nasa/worldwind/event/RenderingListener.java index 3fae5d5108..f859cc5c99 100644 --- a/src/gov/nasa/worldwind/event/RenderingListener.java +++ b/src/gov/nasa/worldwind/event/RenderingListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/SelectEvent.java b/src/gov/nasa/worldwind/event/SelectEvent.java index 27e2a1c7b6..ac07024c64 100644 --- a/src/gov/nasa/worldwind/event/SelectEvent.java +++ b/src/gov/nasa/worldwind/event/SelectEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; @@ -17,25 +39,25 @@ * caused the signal. See the Field Summary for a description of the possible operations. When a SelectEvent * occurs, all select event listeners registered with the associated {@link gov.nasa.worldwind.WorldWindow} are called. * Select event listeners are registered by calling {@link gov.nasa.worldwind.WorldWindow#addSelectListener(SelectListener)}. - *

    + *

    * A ROLLOVER SelectEvent is generated every frame when the cursor is over a visible object either because - * the user moved it there or because the World Window was repainted and a visible object was found to be under the + * the user moved it there or because the WorldWindow was repainted and a visible object was found to be under the * cursor. A ROLLOVER SelectEvent is also generated when there are no longer any objects under the cursor. * Select events generated for objects under the cursor have a non-null pickPoint, and contain the top-most visible * object of all objects at the cursor position. - *

    + *

    * A BOX_ROLLOVER SelectEvent is generated every frame when the selection box intersects a visible object - * either because the user moved or expanded it or because the World Window was repainted and a visible object was found + * either because the user moved or expanded it or because the WorldWindow was repainted and a visible object was found * to intersect the box. A BOX_ROLLOVER SelectEvent is also generated when there are no longer any objects * intersecting the selection box. Select events generated for objects intersecting the selection box have a non-null * pickRectangle, and contain all top-most visible objects of all objects intersecting the selection box. - *

    + *

    * If a select listener performs some action in response to a select event, it should call the event's {@link * #consume()} method in order to indicate to subsequently called listeners that the event has been responded to and no * further action should be taken. Left press select events should not be consumed unless it is necessary to do so. * Consuming left press events prevents the WorldWindow from gaining focus, thereby preventing it from receiving key * events. - *

    + *

    * If no object is under the cursor but the cursor is over terrain, the select event will identify the terrain as the * picked object and will include the corresponding geographic position. See {@link * gov.nasa.worldwind.pick.PickedObject#isTerrain()}. diff --git a/src/gov/nasa/worldwind/event/SelectListener.java b/src/gov/nasa/worldwind/event/SelectListener.java index 4c52a5ea38..5dc18584cd 100644 --- a/src/gov/nasa/worldwind/event/SelectListener.java +++ b/src/gov/nasa/worldwind/event/SelectListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; diff --git a/src/gov/nasa/worldwind/event/WWEvent.java b/src/gov/nasa/worldwind/event/WWEvent.java index c83755f98c..0cf9933242 100644 --- a/src/gov/nasa/worldwind/event/WWEvent.java +++ b/src/gov/nasa/worldwind/event/WWEvent.java @@ -1,14 +1,36 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.event; import java.util.EventObject; /** - * WWEvent is the base class which all World Wind event objects derive from. It extends Java's base {@link + * WWEvent is the base class which all WorldWind event objects derive from. It extends Java's base {@link * java.util.EventObject} by adding the capability to consume the event by calling {@link #consume()}. Consuming a * WWEvent prevents is from being processed in the default manner by the source that originated the event. If the event * cannot be consumed, calling {@code consume()} has no effect, though {@link #isConsumed()} returns whether or not @@ -45,7 +67,7 @@ public void consume() /** * Returns whether or not the event has been consumed. - *

    + *

    * Note: if the event cannot be consumed, this still returns {@code true} if {@link #consume()} has been called, * though this has no effect. * diff --git a/src/gov/nasa/worldwind/exception/NoItemException.java b/src/gov/nasa/worldwind/exception/NoItemException.java index 7178ad17f1..9a1e18cceb 100644 --- a/src/gov/nasa/worldwind/exception/NoItemException.java +++ b/src/gov/nasa/worldwind/exception/NoItemException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.exception; diff --git a/src/gov/nasa/worldwind/exception/ServiceException.java b/src/gov/nasa/worldwind/exception/ServiceException.java index c6559cb132..5d095b54fb 100644 --- a/src/gov/nasa/worldwind/exception/ServiceException.java +++ b/src/gov/nasa/worldwind/exception/ServiceException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.exception; diff --git a/src/gov/nasa/worldwind/exception/WWAbsentRequirementException.java b/src/gov/nasa/worldwind/exception/WWAbsentRequirementException.java index ac374574a5..aea6d31388 100644 --- a/src/gov/nasa/worldwind/exception/WWAbsentRequirementException.java +++ b/src/gov/nasa/worldwind/exception/WWAbsentRequirementException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.exception; diff --git a/src/gov/nasa/worldwind/exception/WWRuntimeException.java b/src/gov/nasa/worldwind/exception/WWRuntimeException.java index 0189f913ee..e19ac6fc96 100644 --- a/src/gov/nasa/worldwind/exception/WWRuntimeException.java +++ b/src/gov/nasa/worldwind/exception/WWRuntimeException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.exception; diff --git a/src/gov/nasa/worldwind/exception/WWTimeoutException.java b/src/gov/nasa/worldwind/exception/WWTimeoutException.java index 81eae3a0e7..22f652eb96 100644 --- a/src/gov/nasa/worldwind/exception/WWTimeoutException.java +++ b/src/gov/nasa/worldwind/exception/WWTimeoutException.java @@ -1,13 +1,35 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.exception; /** - * Thrown when a World Wind operation times out. + * Thrown when a WorldWind operation times out. * * @author tag * @version $Id: WWTimeoutException.java 1171 2013-02-11 21:45:02Z dcollins $ diff --git a/src/gov/nasa/worldwind/exception/WWUnrecognizedException.java b/src/gov/nasa/worldwind/exception/WWUnrecognizedException.java index f964e70d9f..68274108b9 100644 --- a/src/gov/nasa/worldwind/exception/WWUnrecognizedException.java +++ b/src/gov/nasa/worldwind/exception/WWUnrecognizedException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.exception; diff --git a/src/gov/nasa/worldwind/formats/csv/CSVReader.java b/src/gov/nasa/worldwind/formats/csv/CSVReader.java index 3ed2b11386..f0cb2299ad 100644 --- a/src/gov/nasa/worldwind/formats/csv/CSVReader.java +++ b/src/gov/nasa/worldwind/formats/csv/CSVReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.csv; @@ -51,9 +73,9 @@ public List getPoints() } /** - * @param path + * @param path File spec to read from. * @throws IllegalArgumentException if path is null - * @throws java.io.IOException + * @throws java.io.IOException If there are issues reading from the file. */ public void readFile(String path) throws IOException { @@ -79,10 +101,10 @@ public void readFile(String path) throws IOException } /** - * @param stream - * @param name + * @param stream The stream to read from. + * @param name The name of the stream. * @throws IllegalArgumentException if stream is null - * @throws java.io.IOException + * @throws java.io.IOException If there are issues reading the stream. */ public void readStream(InputStream stream, String name) throws IOException { diff --git a/src/gov/nasa/worldwind/formats/csv/CSVTrackPoint.java b/src/gov/nasa/worldwind/formats/csv/CSVTrackPoint.java index 1f87b55a48..c981db541a 100644 --- a/src/gov/nasa/worldwind/formats/csv/CSVTrackPoint.java +++ b/src/gov/nasa/worldwind/formats/csv/CSVTrackPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.csv; @@ -21,7 +43,7 @@ public class CSVTrackPoint implements TrackPoint private double altitude; /** - * @param words + * @param words The point coordinate values. * @throws IllegalArgumentException if words is null or has length less than 1 */ public CSVTrackPoint(String[] words) @@ -87,7 +109,7 @@ public double getLatitude() } /** - * @param latitude + * @param latitude The latitude value. * @throws IllegalArgumentException if latitude is less than -90 or greater than 90 */ public void setLatitude(double latitude) @@ -108,7 +130,7 @@ public double getLongitude() } /** - * @param longitude + * @param longitude The new longitude value. * @throws IllegalArgumentException if longitude is less than -180 or greater than 180 */ public void setLongitude(double longitude) diff --git a/src/gov/nasa/worldwind/formats/csv/CSVWriter.java b/src/gov/nasa/worldwind/formats/csv/CSVWriter.java index 4db063863b..9343cb373b 100644 --- a/src/gov/nasa/worldwind/formats/csv/CSVWriter.java +++ b/src/gov/nasa/worldwind/formats/csv/CSVWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.csv; diff --git a/src/gov/nasa/worldwind/formats/dds/AlphaBlockDXT3.java b/src/gov/nasa/worldwind/formats/dds/AlphaBlockDXT3.java index 6593fa9774..7d4dbdacd9 100644 --- a/src/gov/nasa/worldwind/formats/dds/AlphaBlockDXT3.java +++ b/src/gov/nasa/worldwind/formats/dds/AlphaBlockDXT3.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; @@ -10,7 +32,7 @@ * The DXT2/DXT3 alpha block contains alpha values for 4x4 pixels, each quantized to fit into 4 bits. The alpha values * are tightly packed into 64 bits in the DXT file as follows, where the value aN represents the Nth alpha value in * hexadecimal notation: - *

    + *

    * | 63-56 | 55-48 | 47-40 | 39-32 | 31-24 | 23-16 | 15-8 | 7-0 | * | aFaE | aDaC | aBaA | a9a8 | a7a6 | a5a4 | a3a2 | a1a0 | * diff --git a/src/gov/nasa/worldwind/formats/dds/BasicColorBlockExtractor.java b/src/gov/nasa/worldwind/formats/dds/BasicColorBlockExtractor.java index 447caacbdd..d10863da95 100644 --- a/src/gov/nasa/worldwind/formats/dds/BasicColorBlockExtractor.java +++ b/src/gov/nasa/worldwind/formats/dds/BasicColorBlockExtractor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/BlockDXT1.java b/src/gov/nasa/worldwind/formats/dds/BlockDXT1.java index 13f14e2f47..d8d237c492 100644 --- a/src/gov/nasa/worldwind/formats/dds/BlockDXT1.java +++ b/src/gov/nasa/worldwind/formats/dds/BlockDXT1.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; @@ -13,7 +35,7 @@ * first color is less than the second color, then one additional color is defined for a total of three colors, and the * fourth color is interpreted as transparent black. Finally, the block contains 4x4 2 bit indices into the array of * four colors (one of which may be transparent black). - *

    + *

    * From http://msdn.microsoft.com/en-us/library/bb204843(VS.85).aspx: * If 64-bit blocks - that is, format DXT1 - are used for the texture, it is possible to mix the opaque and 1-bit alpha * formats on a per-block basis within the same texture. In other words, the comparison of the unsigned integer diff --git a/src/gov/nasa/worldwind/formats/dds/BlockDXT1Compressor.java b/src/gov/nasa/worldwind/formats/dds/BlockDXT1Compressor.java index aaff2e34f9..8e3b928e5d 100644 --- a/src/gov/nasa/worldwind/formats/dds/BlockDXT1Compressor.java +++ b/src/gov/nasa/worldwind/formats/dds/BlockDXT1Compressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/BlockDXT3.java b/src/gov/nasa/worldwind/formats/dds/BlockDXT3.java index eaf3a80a55..fc0fbf5a18 100644 --- a/src/gov/nasa/worldwind/formats/dds/BlockDXT3.java +++ b/src/gov/nasa/worldwind/formats/dds/BlockDXT3.java @@ -1,14 +1,36 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; /** * BlockDXT3 is a data structure representing the compressed alpha and color values in a single DXT2/DXT3 * block. The DXT3 block contains a 64 bit alpha block, and a 64 bit color block, stored here as the properties - * alphaBlock and colorBlock. The 64 bit alpha block contains 4x4 alpha values quantized + * alphaBlock and colorBlock. The 64 bit alpha block contains 4x4 alpha values quantized * into 4 bits. The 64 bit color block is formatted exactly like the DXT1 color block, except that the color block * always represents four colors, regardless of the color ordering in the DXT1 block. * diff --git a/src/gov/nasa/worldwind/formats/dds/BlockDXT3Compressor.java b/src/gov/nasa/worldwind/formats/dds/BlockDXT3Compressor.java index 29f01454d4..32b19e5dbe 100644 --- a/src/gov/nasa/worldwind/formats/dds/BlockDXT3Compressor.java +++ b/src/gov/nasa/worldwind/formats/dds/BlockDXT3Compressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; @@ -10,7 +32,7 @@ /** * Compressor for DXT2/DXT3 alpha and color blocks. This class is not thread safe. Unsynchronized access will result in * unpredictable behavior. Access to methods of this class must be synchronized by the caller. - *

    + *

    * Documentation on the DXT2/DXT3 format is available at http://msdn.microsoft.com/en-us/library/bb694531.aspx under * the name "BC2". * @@ -36,7 +58,7 @@ public BlockDXT3Compressor() * Compress the 4x4 color block into a DXT2/DXT3 block using 16 4 bit alpha values, and four colors. This method * compresses the color block exactly as a DXT1 compressor, except that it guarantees that the DXT1 block will use * four colors. - *

    + *

    * Access to this method must be synchronized by the caller. This method is frequently invoked by the DXT * compressor, so in order to reduce garbage each instance of this class has unsynchronized properties that are * reused during each call. diff --git a/src/gov/nasa/worldwind/formats/dds/Color24.java b/src/gov/nasa/worldwind/formats/dds/Color24.java index 80eafe9b3e..d595742352 100644 --- a/src/gov/nasa/worldwind/formats/dds/Color24.java +++ b/src/gov/nasa/worldwind/formats/dds/Color24.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/Color32.java b/src/gov/nasa/worldwind/formats/dds/Color32.java index 6107fa0818..dcff850077 100644 --- a/src/gov/nasa/worldwind/formats/dds/Color32.java +++ b/src/gov/nasa/worldwind/formats/dds/Color32.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/ColorBlock4x4.java b/src/gov/nasa/worldwind/formats/dds/ColorBlock4x4.java index 0462b68a5e..6aabafe1d4 100644 --- a/src/gov/nasa/worldwind/formats/dds/ColorBlock4x4.java +++ b/src/gov/nasa/worldwind/formats/dds/ColorBlock4x4.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/ColorBlockExtractor.java b/src/gov/nasa/worldwind/formats/dds/ColorBlockExtractor.java index 069029915c..feef262478 100644 --- a/src/gov/nasa/worldwind/formats/dds/ColorBlockExtractor.java +++ b/src/gov/nasa/worldwind/formats/dds/ColorBlockExtractor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DDSCompressor.java b/src/gov/nasa/worldwind/formats/dds/DDSCompressor.java index 5c45e11efd..79ec7e2b0c 100644 --- a/src/gov/nasa/worldwind/formats/dds/DDSCompressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DDSCompressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; @@ -13,7 +35,7 @@ * DDSCompressor converts in-memory images into a DDS file encoded with one of the DXT block compression algorithms. If * the caller wants to encode using a certain type of DXT compression, DDSCompressor provides the appropriate methods to * do that. Otherwise, DDSCompressor chooses the DXT compression scheme that best suits the source image. - *

    + *

    * Each compression method accepts a reference to a {@link gov.nasa.worldwind.formats.dds.DXTCompressionAttributes}. * This compressor performs the appropriate actions according to the attributes, such as building mip maps and * converting the source image to a premultiplied alpha format. @@ -363,7 +385,7 @@ public static java.nio.ByteBuffer compressImage(java.awt.image.BufferedImage ima /** * Returns the default compression attributes. The default DXT compression attributes are defined as follows: - * + *
    AttributeValue
    Build Mipmapstrue
    *
    Default Attributes
    AttributeValue
    Build Mipmapstrue
    Premultiply Alphatrue
    DXT FormatLet DDSCompressor choose optimal * format.
    Enable DXT1 Alphafalse
    DXT1 Alpha * Threshold128
    Compression AlgorithmEuclidean Distance
    diff --git a/src/gov/nasa/worldwind/formats/dds/DDSConstants.java b/src/gov/nasa/worldwind/formats/dds/DDSConstants.java index 8614a1a182..51ea29f1e9 100644 --- a/src/gov/nasa/worldwind/formats/dds/DDSConstants.java +++ b/src/gov/nasa/worldwind/formats/dds/DDSConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DDSDecompressor.java b/src/gov/nasa/worldwind/formats/dds/DDSDecompressor.java index 35ee494598..2160c3cc1c 100644 --- a/src/gov/nasa/worldwind/formats/dds/DDSDecompressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DDSDecompressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DDSHeader.java b/src/gov/nasa/worldwind/formats/dds/DDSHeader.java index 39d89cb899..f872bc3601 100644 --- a/src/gov/nasa/worldwind/formats/dds/DDSHeader.java +++ b/src/gov/nasa/worldwind/formats/dds/DDSHeader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; @@ -199,7 +221,7 @@ public static DDSHeader readFrom(Object source) throws Exception /** * Creates (reads) a DDSHeader from a ByteBuffer. * - * @param buffer + * @param buffer The buffer to read from * @return DDSHeader * @throws IllegalArgumentException if the ByteBuffer is null * @throws IOException if the buffer length or content is invalid diff --git a/src/gov/nasa/worldwind/formats/dds/DDSPixelFormat.java b/src/gov/nasa/worldwind/formats/dds/DDSPixelFormat.java index ef8fd41327..9347897330 100644 --- a/src/gov/nasa/worldwind/formats/dds/DDSPixelFormat.java +++ b/src/gov/nasa/worldwind/formats/dds/DDSPixelFormat.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXT1Compressor.java b/src/gov/nasa/worldwind/formats/dds/DXT1Compressor.java index d548ee1965..3969513b5c 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXT1Compressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DXT1Compressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXT1Decompressor.java b/src/gov/nasa/worldwind/formats/dds/DXT1Decompressor.java index 1de01979eb..bf5d59adde 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXT1Decompressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DXT1Decompressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXT3Compressor.java b/src/gov/nasa/worldwind/formats/dds/DXT3Compressor.java index 747d7e0e87..4aab65c64e 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXT3Compressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DXT3Compressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXT3Decompressor.java b/src/gov/nasa/worldwind/formats/dds/DXT3Decompressor.java index 88025b9793..3127236760 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXT3Decompressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DXT3Decompressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXTCompressionAttributes.java b/src/gov/nasa/worldwind/formats/dds/DXTCompressionAttributes.java index 6e5462c610..cddd60b029 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXTCompressionAttributes.java +++ b/src/gov/nasa/worldwind/formats/dds/DXTCompressionAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXTCompressor.java b/src/gov/nasa/worldwind/formats/dds/DXTCompressor.java index c502924fe8..87f2e0103f 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXTCompressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DXTCompressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dds/DXTDecompressor.java b/src/gov/nasa/worldwind/formats/dds/DXTDecompressor.java index 716fd41c06..79573e57e3 100644 --- a/src/gov/nasa/worldwind/formats/dds/DXTDecompressor.java +++ b/src/gov/nasa/worldwind/formats/dds/DXTDecompressor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; @@ -18,7 +40,7 @@ public interface DXTDecompressor /** * Decompress DXT1, DXT3 and DXT3A encoded rasters * - * @param buffer + * @param buffer The buffer to decompress. * @param width must be a positive and power of two (4, 8, 16, 32, 64, 128, 512, etc ) * @param height must be a positive and power of two (4, 8, 16, 32, 64, 128, 512, etc ) * @return java.awt.image.BufferedImage instance diff --git a/src/gov/nasa/worldwind/formats/dds/StandaloneDDSConverter.java b/src/gov/nasa/worldwind/formats/dds/StandaloneDDSConverter.java index 88f1f0615d..f52ff76ce2 100644 --- a/src/gov/nasa/worldwind/formats/dds/StandaloneDDSConverter.java +++ b/src/gov/nasa/worldwind/formats/dds/StandaloneDDSConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dds; diff --git a/src/gov/nasa/worldwind/formats/dted/DTED.java b/src/gov/nasa/worldwind/formats/dted/DTED.java index 3a01233480..265ce4bb66 100644 --- a/src/gov/nasa/worldwind/formats/dted/DTED.java +++ b/src/gov/nasa/worldwind/formats/dted/DTED.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.dted; diff --git a/src/gov/nasa/worldwind/formats/gcps/GCPSReader.java b/src/gov/nasa/worldwind/formats/gcps/GCPSReader.java index ff66da7111..1f42530e3b 100644 --- a/src/gov/nasa/worldwind/formats/gcps/GCPSReader.java +++ b/src/gov/nasa/worldwind/formats/gcps/GCPSReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gcps; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONConstants.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONConstants.java index 3a544f5451..05cdde96a4 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONConstants.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONCoordinateParser.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONCoordinateParser.java index 3dfe635b5c..f12b8843cb 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONCoordinateParser.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONCoordinateParser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONDoc.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONDoc.java index bf0804bccb..62cc433c22 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONDoc.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONDoc.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParser.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParser.java index c99c8c1ccf..8a5d5b26ed 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParser.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParserContext.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParserContext.java index ad02cd0b6b..d15f507477 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParserContext.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONEventParserContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeature.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeature.java index 619c5ccac4..665b6de378 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeature.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeatureCollection.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeatureCollection.java index ad3fada00e..e19fe53117 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeatureCollection.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONFeatureCollection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometry.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometry.java index 16c310d58f..42ebaaf92f 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometry.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometryCollection.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometryCollection.java index 657ffb5993..8902e09219 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometryCollection.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONGeometryCollection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONLineString.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONLineString.java index 40adef3c1e..55f722c38b 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONLineString.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONLineString.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiLineString.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiLineString.java index d1e33b5cf4..c32ceab583 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiLineString.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiLineString.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPoint.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPoint.java index fa5e9e3847..9e02185078 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPoint.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPolygon.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPolygon.java index 061eb62784..853c9ff6ec 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPolygon.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONMultiPolygon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONObject.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONObject.java index fb459aab4b..4178f11b22 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONObject.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONObject.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONPoint.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONPoint.java index 9d95c095ab..634c1fcdaa 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONPoint.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONPolygon.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONPolygon.java index c4cb0b9010..ecb6b683ba 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONPolygon.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONPolygon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/geojson/GeoJSONPositionArray.java b/src/gov/nasa/worldwind/formats/geojson/GeoJSONPositionArray.java index beb0e93a96..f5f3241c1e 100644 --- a/src/gov/nasa/worldwind/formats/geojson/GeoJSONPositionArray.java +++ b/src/gov/nasa/worldwind/formats/geojson/GeoJSONPositionArray.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.geojson; diff --git a/src/gov/nasa/worldwind/formats/georss/GeoRSSParser.java b/src/gov/nasa/worldwind/formats/georss/GeoRSSParser.java index 4e4e0e1598..3528614959 100644 --- a/src/gov/nasa/worldwind/formats/georss/GeoRSSParser.java +++ b/src/gov/nasa/worldwind/formats/georss/GeoRSSParser.java @@ -1,10 +1,34 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.georss; +import gov.nasa.worldwind.WorldWind; +import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.exception.WWRuntimeException; import gov.nasa.worldwind.geom.*; import gov.nasa.worldwind.render.*; @@ -22,531 +46,456 @@ * @author tag * @version $Id: GeoRSSParser.java 1171 2013-02-11 21:45:02Z dcollins $ */ - -public class GeoRSSParser -{ +public class GeoRSSParser { + public static final String GEORSS_URI = "http://www.georss.org/georss"; public static final String GML_URI = "http://www.opengis.net/gml"; - - public static List parseFragment(String fragmentString, NamespaceContext nsc) - { + + public static List parseFragment(String fragmentString, NamespaceContext nsc) { return parseShapes(fixNamespaceQualification(fragmentString)); } - - public static List parseShapes(String docString) - { - if (docString == null) - { + + public static List parseShapes(String docString) { + if (docString == null) { String message = Logging.getMessage("nullValue.StringIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); } - - if (docString.length() < 1) // avoid empty strings + + if (docString.length() < 1) { // avoid empty strings return null; - - try - { + } + + try { DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); docBuilderFactory.setNamespaceAware(true); DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); Document doc = docBuilder.parse(new InputSource(new StringReader(docString))); - + List shapes = parseShapes(doc); - - if (shapes == null || shapes.size() < 1) - { + + if (shapes == null || shapes.size() < 1) { Logging.logger().log(Level.WARNING, "GeoRSS.NoShapes", docString); return null; } - + return shapes; - } - catch (ParserConfigurationException e) - { + } catch (ParserConfigurationException e) { String message = Logging.getMessage("GeoRSS.ParserConfigurationException"); Logging.logger().log(Level.SEVERE, message, e); throw new WWRuntimeException(message, e); - } - catch (IOException e) - { - String message = Logging.getMessage("GeoRSS.IOExceptionParsing", docString); - Logging.logger().log(Level.SEVERE, message, e); - throw new WWRuntimeException(message, e); - } - catch (SAXException e) - { + } catch (IOException | SAXException e) { String message = Logging.getMessage("GeoRSS.IOExceptionParsing", docString); Logging.logger().log(Level.SEVERE, message, e); throw new WWRuntimeException(message, e); } } - - private static String fixNamespaceQualification(String xmlString) - { + + private static String fixNamespaceQualification(String xmlString) { String lcaseString = xmlString.toLowerCase(); StringBuffer qualifiers = new StringBuffer(); - - if (lcaseString.contains("georss:") && !lcaseString.contains(GEORSS_URI)) - { + + if (lcaseString.contains("georss:") && !lcaseString.contains(GEORSS_URI)) { qualifiers.append(" xmlns:georss=\""); qualifiers.append(GEORSS_URI); qualifiers.append("\""); } - - if (lcaseString.contains("gml:") && !lcaseString.contains(GML_URI)) - { + + if (lcaseString.contains("gml:") && !lcaseString.contains(GML_URI)) { qualifiers.append(" xmlns:gml=\""); qualifiers.append(GML_URI); qualifiers.append("\""); } - - if (qualifiers.length() > 0) - { - StringBuffer sb = new StringBuffer(); + + if (qualifiers.length() > 0) { + StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(xmlString); sb.append(""); - + return sb.toString(); } - + return xmlString; } - - private static String surroundWithNameSpaces(String docString) - { - StringBuffer sb = new StringBuffer(); - sb.append(""); - sb.append(docString); - sb.append(""); -// System.out.println(sb.toString()); - - return sb.toString(); - } - - public static List parseShapes(File file) - { - if (file == null) - { + + public static List parseShapes(File file) { + if (file == null) { String message = Logging.getMessage("nullValue.FileIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); } - - try - { + + try { DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); docBuilderFactory.setNamespaceAware(false); DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); Document doc = docBuilder.parse(file); - + List shapes = parseShapes(doc); - - if (shapes == null || shapes.size() < 1) - { + + if (shapes == null || shapes.size() < 1) { Logging.logger().log(Level.WARNING, "GeoRSS.NoShapes", file.getPath()); return null; } - + return shapes; - } - catch (ParserConfigurationException e) - { + } catch (ParserConfigurationException e) { String message = Logging.getMessage("GeoRSS.ParserConfigurationException"); Logging.logger().log(Level.SEVERE, message, e); throw new WWRuntimeException(message, e); - } - catch (IOException e) - { - String message = Logging.getMessage("GeoRSS.IOExceptionParsing", file.getPath()); - Logging.logger().log(Level.SEVERE, message, e); - throw new WWRuntimeException(message, e); - } - catch (SAXException e) - { + } catch (IOException | SAXException e) { String message = Logging.getMessage("GeoRSS.IOExceptionParsing", file.getPath()); Logging.logger().log(Level.SEVERE, message, e); throw new WWRuntimeException(message, e); } } - - public static List parseShapes(Document xmlDoc) - { - if (xmlDoc == null) - { + + public static List parseShapes(Document xmlDoc) { + if (xmlDoc == null) { String message = Logging.getMessage("nullValue.DocumentIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); } - - ArrayList shapeNodes = new ArrayList(); - ArrayList attributeNodes = new ArrayList(); + + ArrayList shapeNodes = new ArrayList<>(); + ArrayList attributeNodes = new ArrayList<>(); // Shapes NodeList nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "where"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(shapeNodes, nodes); - + } + nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "point"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(shapeNodes, nodes); - + } + nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "line"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(shapeNodes, nodes); - + } + nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "polygon"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(shapeNodes, nodes); - + } + nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "box"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(shapeNodes, nodes); + } // Attributes nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "radius"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(attributeNodes, nodes); - + } + nodes = xmlDoc.getElementsByTagNameNS(GEORSS_URI, "elev"); - if (nodes != null && nodes.getLength() > 0) + if (nodes != null && nodes.getLength() > 0) { addNodes(attributeNodes, nodes); - - ArrayList shapes = new ArrayList(); - - if (shapeNodes.size() < 1) + } + + ArrayList shapes = new ArrayList<>(); + + if (shapeNodes.size() < 1) { return null; // No warning here. Let the calling method inform of this case. - - for (Node node : shapeNodes) - { + } + for (Node node : shapeNodes) { Renderable shape = null; String localName = node.getLocalName(); - - if (localName.equals("point")) - shape = makePointShape(node, attributeNodes); - - else if (localName.equals("where")) - shape = makeWhereShape(node); - - else if (localName.equals("line")) - shape = makeLineShape(node, attributeNodes); - - else if (localName.equals("polygon")) - shape = makePolygonShape(node, attributeNodes); - - else if (localName.equals("box")) - shape = makeBoxShape(node, attributeNodes); - - if (shape != null) + + switch (localName) { + case "point": + shape = makePointShape(node, attributeNodes); + break; + case "where": + shape = makeWhereShape(node); + break; + case "line": + shape = makeLineShape(node, attributeNodes); + break; + case "polygon": + shape = makePolygonShape(node, attributeNodes); + break; + case "box": + shape = makeBoxShape(node, attributeNodes); + break; + default: + break; + } + + if (shape != null) { shapes.add(shape); + } } - + return shapes; } - - private static void addNodes(ArrayList nodeList, NodeList nodes) - { - for (int i = 0; i < nodes.getLength(); i++) - { + + private static void addNodes(ArrayList nodeList, NodeList nodes) { + for (int i = 0; i < nodes.getLength(); i++) { nodeList.add(nodes.item(i)); } } - - private static Renderable makeWhereShape(Node node) - { + + private static Renderable makeWhereShape(Node node) { Node typeNode = findChildByLocalName(node, "Polygon"); - if (typeNode != null) + if (typeNode != null) { return makeGMLPolygonShape(typeNode); - + } + typeNode = findChildByLocalName(node, "Envelope"); - if (typeNode != null) + if (typeNode != null) { return makeGMLEnvelopeShape(typeNode); - + } + typeNode = findChildByLocalName(node, "LineString"); - if (typeNode != null) + if (typeNode != null) { return makeGMLineStringShape(typeNode); - + } + typeNode = findChildByLocalName(node, "Point"); - if (typeNode != null) + if (typeNode != null) { return makeGMLPointShape(typeNode); - + } + Logging.logger().log(Level.WARNING, "GeoRSS.MissingElementContent", "where"); return null; } - - private static Renderable makeGMLPolygonShape(Node node) - { + + private static Renderable makeGMLPolygonShape(Node node) { Node n = findChildByLocalName(node, "exterior"); - if (n == null) - { + if (n == null) { Logging.logger().log(Level.WARNING, "GeoRSS.MissingElement", "exterior"); return null; } - + n = findChildByLocalName(n, "LinearRing"); - if (n == null) - { + if (n == null) { Logging.logger().log(Level.WARNING, "GeoRSS.MissingElement", "LinearRing"); return null; } - + return makePolygonShape(n, null); } - - private static Renderable makePolygonShape(Node node, Iterable attrs) - { + + private static Renderable makePolygonShape(Node node, Iterable attrs) { String valuesString = node.getTextContent(); - if (valuesString == null) - { + if (valuesString == null) { Logging.logger().log(Level.WARNING, "GeoRSS.NoCoordinates", node.getLocalName()); return null; } - + ArrayList values = getDoubleValues(valuesString); - if (values.size() < 8 || values.size() % 2 != 0) - { + if (values.size() < 8 || values.size() % 2 != 0) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", node.getLocalName()); return null; } - - ArrayList positions = new ArrayList(); - for (int i = 0; i < values.size(); i += 2) - { + + ArrayList positions = new ArrayList<>(); + for (int i = 0; i < values.size(); i += 2) { positions.add(LatLon.fromDegrees(values.get(i), values.get(i + 1))); } - + double elevation = attrs != null ? getElevation(node, attrs) : 0d; - if (elevation != 0) - { - Polyline pl = new Polyline(positions, elevation); - pl.setFilled(true); - pl.setPathType(Polyline.GREAT_CIRCLE); - - return pl; - } - else - { + if (elevation != 0) { + Path path = new Path(positions, elevation); + path.setAttributes(new BasicShapeAttributes()); + path.getAttributes().setOutlineMaterial(Material.WHITE); + path.setPathType(AVKey.GREAT_CIRCLE); + return path; + } else { return new SurfacePolygon(positions); } } - - private static Renderable makeGMLEnvelopeShape(Node node) - { + + private static Renderable makeGMLEnvelopeShape(Node node) { Node n = findChildByLocalName(node, "lowerCorner"); - if (n == null) - { + if (n == null) { Logging.logger().log(Level.WARNING, "GeoRSS.MissingElement", " lowerCorner"); return null; } - + String lowerCornerString = n.getTextContent(); - if (lowerCornerString == null) - { + if (lowerCornerString == null) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", " lowerCorner"); return null; } - + n = findChildByLocalName(node, "upperCorner"); - if (n == null) - { + if (n == null) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", " upperCorner"); return null; } - + String upperCornerString = n.getTextContent(); - if (upperCornerString == null) - { + if (upperCornerString == null) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", " upperCorner"); return null; } - + ArrayList lv = getDoubleValues(lowerCornerString); - if (lv.size() != 2) - { + if (lv.size() != 2) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", " lowerCorner"); return null; } - + ArrayList uv = getDoubleValues(upperCornerString); - if (uv.size() != 2) - { + if (uv.size() != 2) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", " upperCorner"); return null; } - + return new SurfaceSector(Sector.fromDegrees(lv.get(0), uv.get(0), lv.get(1), uv.get(1))); } - - private static Renderable makeBoxShape(Node node, Iterable attrs) - { + + private static Renderable makeBoxShape(Node node, Iterable attrs) { String valuesString = node.getTextContent(); - if (valuesString == null) - { + if (valuesString == null) { Logging.logger().log(Level.WARNING, "GeoRSS.NoCoordinates", node.getLocalName()); return null; } - + ArrayList p = getDoubleValues(valuesString); - if (p.size() != 4) - { + if (p.size() != 4) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", node.getLocalName()); return null; } - + double elevation = getElevation(node, attrs); - if (elevation != 0) + if (elevation != 0) { return new Quadrilateral(LatLon.fromDegrees(p.get(0), p.get(1)), - LatLon.fromDegrees(p.get(2), p.get(3)), elevation); - else + LatLon.fromDegrees(p.get(2), p.get(3)), elevation); + } else { return new SurfaceSector(Sector.fromDegrees(p.get(0), p.get(2), p.get(1), p.get(3))); + } } - - private static Renderable makeGMLineStringShape(Node node) - { + + private static Renderable makeGMLineStringShape(Node node) { Node n = findChildByLocalName(node, "posList"); - if (n == null) - { + if (n == null) { Logging.logger().log(Level.WARNING, "GeoRSS.MissingElement", "posList"); return null; } - + return makeLineShape(n, null); } - - private static Renderable makeLineShape(Node node, Iterable attrs) - { + + private static Renderable makeLineShape(Node node, Iterable attrs) { String valuesString = node.getTextContent(); - if (valuesString == null) - { + if (valuesString == null) { Logging.logger().log(Level.WARNING, "GeoRSS.NoCoordinates", node.getLocalName()); return null; } - + ArrayList values = getDoubleValues(valuesString); - if (values.size() < 4) - { + if (values.size() < 4) { Logging.logger().log(Level.WARNING, "GeoRSS.InvalidCoordinateCount", node.getLocalName()); return null; } - - ArrayList positions = new ArrayList(); - for (int i = 0; i < values.size(); i += 2) - { + + ArrayList positions = new ArrayList<>(); + for (int i = 0; i < values.size(); i += 2) { positions.add(LatLon.fromDegrees(values.get(i), values.get(i + 1))); } - + double elevation = attrs != null ? getElevation(node, attrs) : 0d; - if (elevation != 0) - { - Polyline pl = new Polyline(positions, elevation); - pl.setPathType(Polyline.GREAT_CIRCLE); - return pl; - } - else - { - return new Polyline(positions, 0); - } + Path path; + if (elevation != 0) { + path = new Path(positions, elevation); + } else { + path = new Path(positions, 0); + } + path.setAttributes(new BasicShapeAttributes()); + path.getAttributes().setOutlineMaterial(Material.WHITE); + path.setPathType(AVKey.GREAT_CIRCLE); + return path; } - + @SuppressWarnings({"UnusedDeclaration"}) - private static Renderable makeGMLPointShape(Node node) - { + private static Renderable makeGMLPointShape(Node node) { return null; // No shape provided for points. Expect app to use icons. } - + @SuppressWarnings({"UnusedDeclaration"}) - private static Renderable makePointShape(Node node, Iterable attrs) - { + private static Renderable makePointShape(Node node, Iterable attrs) { return null; // No shape provided for points. Expect app to use icons. } - - private static Node findChildByLocalName(Node parent, String localName) - { + + private static Node findChildByLocalName(Node parent, String localName) { NodeList children = parent.getChildNodes(); - if (children == null || children.getLength() < 1) + if (children == null || children.getLength() < 1) { return null; - - for (int i = 0; i < children.getLength(); i++) - { + } + + for (int i = 0; i < children.getLength(); i++) { String ln = children.item(i).getLocalName(); - if (ln != null && ln.equals(localName)) + if (ln != null && ln.equals(localName)) { return children.item(i); + } } - + return null; } - - private static Node findSiblingAttribute(String attrName, Iterable attribs, Node shapeNode) - { - for (Node attrib : attribs) - { - if (!attrib.getLocalName().equals(attrName)) + + private static Node findSiblingAttribute(String attrName, Iterable attribs, Node shapeNode) { + for (Node attrib : attribs) { + if (!attrib.getLocalName().equals(attrName)) { continue; - - if (attrib.getParentNode().equals(shapeNode.getParentNode())) + } + + if (attrib.getParentNode().equals(shapeNode.getParentNode())) { return attrib; + } } - + return null; } - - private static ArrayList getDoubleValues(String stringValues) - { + + private static ArrayList getDoubleValues(String stringValues) { String[] tokens = stringValues.trim().split("[ ,\n]"); - if (tokens.length < 1) + if (tokens.length < 1) { return null; - - ArrayList arl = new ArrayList(); - for (String s : tokens) - { - if (s == null || s.length() < 1) + } + + ArrayList arl = new ArrayList<>(); + for (String s : tokens) { + if (s == null || s.length() < 1) { continue; - + } + double d; - try - { + try { d = Double.parseDouble(s); - } - catch (NumberFormatException e) - { + } catch (NumberFormatException e) { Logging.logger().log(Level.SEVERE, "GeoRSS.NumberFormatException", s); continue; } - + arl.add(d); } - + return arl; } - - private static double getElevation(Node shapeNode, Iterable attrs) - { + + private static double getElevation(Node shapeNode, Iterable attrs) { double elevation = 0d; - + Node elevNode = findSiblingAttribute("elev", attrs, shapeNode); - if (elevNode != null) - { + if (elevNode != null) { ArrayList ev = getDoubleValues(elevNode.getTextContent()); - if (ev != null && ev.size() > 0) - { + if (ev != null && ev.size() > 0) { elevation = ev.get(0); - } - else - { - Logging.logger().log(Level.WARNING, "GeoRSS.MissingElementContent", "elev"); + } else { + Logging.logger().log(Level.WARNING, "GeoRSS.MissingElementContent", "elev"); } } - + return elevation; } } diff --git a/src/gov/nasa/worldwind/formats/gpx/ElementParser.java b/src/gov/nasa/worldwind/formats/gpx/ElementParser.java index d74e0b2453..06f15d8e4c 100644 --- a/src/gov/nasa/worldwind/formats/gpx/ElementParser.java +++ b/src/gov/nasa/worldwind/formats/gpx/ElementParser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; @@ -41,11 +63,11 @@ public String getElementName() /** * Starts an element. No parameters may be null. * - * @param uri - * @param lname - * @param qname - * @param attributes - * @throws org.xml.sax.SAXException + * @param uri Element URI. + * @param lname Element lname. + * @param qname Element qname. + * @param attributes Element attributes. + * @throws org.xml.sax.SAXException if a parsing error occurs. * @throws IllegalArgumentException if any argument is null */ public void startElement(String uri, String lname, String qname, org.xml.sax.Attributes attributes) @@ -85,10 +107,10 @@ public void startElement(String uri, String lname, String qname, org.xml.sax.Att /** * Finishes an element. No parameters may be null. * - * @param uri - * @param lname - * @param qname - * @throws org.xml.sax.SAXException + * @param uri Element URI. + * @param lname Element lname. + * @param qname Element qname. + * @throws org.xml.sax.SAXException if a parsing error occurs. * @throws IllegalArgumentException if any argument is null */ public void endElement(String uri, String lname, String qname) throws org.xml.sax.SAXException @@ -133,9 +155,9 @@ protected void doEndElement(String uri, String lname, String qname) throws org.x } /** - * @param data - * @param start - * @param length + * @param data The data to set currentCharacters from. + * @param start The start index of the data. + * @param length The length of the data. * @throws IllegalArgumentException if data has length less than 1 */ public void characters(char[] data, int start, int length) diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxReader.java b/src/gov/nasa/worldwind/formats/gpx/GpxReader.java index f7e8a8e0bb..18621ecbf3 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxReader.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; @@ -29,10 +51,10 @@ public GpxReader() throws javax.xml.parsers.ParserConfigurationException, org.xm } /** - * @param path + * @param path The file spec to read from. * @throws IllegalArgumentException if path is null * @throws java.io.IOException if no file exists at the location specified by path - * @throws org.xml.sax.SAXException + * @throws org.xml.sax.SAXException if a parsing error occurs. */ public void readFile(String path) throws java.io.IOException, org.xml.sax.SAXException { @@ -56,10 +78,10 @@ public void readFile(String path) throws java.io.IOException, org.xml.sax.SAXExc } /** - * @param stream + * @param stream The stream to read from. * @throws IllegalArgumentException if stream is null - * @throws java.io.IOException - * @throws org.xml.sax.SAXException + * @throws java.io.IOException if a problem is encountered reading the stream. + * @throws org.xml.sax.SAXException if a parsing error occurs. */ public void readStream(java.io.InputStream stream) throws java.io.IOException, org.xml.sax.SAXException { diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxRoute.java b/src/gov/nasa/worldwind/formats/gpx/GpxRoute.java index 4f4cf54695..b8f236474c 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxRoute.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxRoute.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxRoutePoint.java b/src/gov/nasa/worldwind/formats/gpx/GpxRoutePoint.java index bfb9a4953b..ef99f8059e 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxRoutePoint.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxRoutePoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxTrack.java b/src/gov/nasa/worldwind/formats/gpx/GpxTrack.java index 529ee6a4e9..f5bf56ba67 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxTrack.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxTrack.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; @@ -58,12 +80,12 @@ public int getNumPoints() } /** - * @param uri - * @param lname - * @param qname - * @param attributes + * @param uri The element URI. + * @param lname the element lname. + * @param qname the element qname. + * @param attributes the element attributes. * @throws IllegalArgumentException if lname is null - * @throws org.xml.sax.SAXException + * @throws org.xml.sax.SAXException if a parsing error has occurred. */ @Override public void doStartElement(String uri, String lname, String qname, org.xml.sax.Attributes attributes) @@ -103,11 +125,11 @@ public void doStartElement(String uri, String lname, String qname, org.xml.sax.A } /** - * @param uri - * @param lname - * @param qname + * @param uri The element URI. + * @param lname the element lname. + * @param qname the element qname. * @throws IllegalArgumentException if lname is null - * @throws org.xml.sax.SAXException + * @throws org.xml.sax.SAXException if a parsing error occurs. */ @Override public void doEndElement(String uri, String lname, String qname) throws org.xml.sax.SAXException diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxTrackPoint.java b/src/gov/nasa/worldwind/formats/gpx/GpxTrackPoint.java index 347fbc3080..c52c2fd04e 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxTrackPoint.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxTrackPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; @@ -62,11 +84,11 @@ public void doStartElement(String uri, String lname, String qname, org.xml.sax.A } /** - * @param uri - * @param lname - * @param qname + * @param uri The element URI. + * @param lname The element lname. + * @param qname The element qname. * @throws IllegalArgumentException if lname is null - * @throws org.xml.sax.SAXException + * @throws org.xml.sax.SAXException if a parsing error occurs. */ @Override public void doEndElement(String uri, String lname, String qname) throws org.xml.sax.SAXException @@ -95,7 +117,7 @@ public double getLatitude() } /** - * @param latitude + * @param latitude The new latitude. * @throws IllegalArgumentException if latitude is less than -90 or greater than 90 */ public void setLatitude(double latitude) @@ -116,7 +138,7 @@ public double getLongitude() } /** - * @param longitude + * @param longitude The new longitude. * @throws IllegalArgumentException if longitude is less than -180 or greater than 180 */ public void setLongitude(double longitude) @@ -166,7 +188,7 @@ public String getTime() } /** - * @param time + * @param time The new time. * @throws IllegalArgumentException if time is null */ public void setTime(String time) diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxTrackSegment.java b/src/gov/nasa/worldwind/formats/gpx/GpxTrackSegment.java index a0037114ef..c571b37607 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxTrackSegment.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxTrackSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; @@ -31,12 +53,12 @@ public java.util.List getPoints() } /** - * @param uri - * @param lname - * @param qname - * @param attributes + * @param uri The element URI. + * @param lname the element lname. + * @param qname the element qname. + * @param attributes The element attributes. * @throws IllegalArgumentException if any parameter is null - * @throws org.xml.sax.SAXException + * @throws org.xml.sax.SAXException if a parsing error occurs. */ @Override public void doStartElement(String uri, String lname, String qname, org.xml.sax.Attributes attributes) diff --git a/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java b/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java index c7fc5c2bb9..7ef6854e93 100644 --- a/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java +++ b/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.gpx; @@ -81,7 +103,7 @@ private void createGpxDocument(org.w3c.dom.Document doc) org.w3c.dom.Element gpx = doc.createElement("gpx"); gpx.setAttribute("version", "1.1"); - gpx.setAttribute("creator", "NASA World Wind"); + gpx.setAttribute("creator", "NASA WorldWind"); doc.appendChild(gpx); } } diff --git a/src/gov/nasa/worldwind/formats/json/BasicJSONEvent.java b/src/gov/nasa/worldwind/formats/json/BasicJSONEvent.java index 4d31443264..5ca60fddcf 100644 --- a/src/gov/nasa/worldwind/formats/json/BasicJSONEvent.java +++ b/src/gov/nasa/worldwind/formats/json/BasicJSONEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/BasicJSONEventParser.java b/src/gov/nasa/worldwind/formats/json/BasicJSONEventParser.java index 885379efad..37ccaf93c2 100644 --- a/src/gov/nasa/worldwind/formats/json/BasicJSONEventParser.java +++ b/src/gov/nasa/worldwind/formats/json/BasicJSONEventParser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/BasicJSONEventParserContext.java b/src/gov/nasa/worldwind/formats/json/BasicJSONEventParserContext.java index ea0bd9cadc..fc577ff1d8 100644 --- a/src/gov/nasa/worldwind/formats/json/BasicJSONEventParserContext.java +++ b/src/gov/nasa/worldwind/formats/json/BasicJSONEventParserContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/JSONDoc.java b/src/gov/nasa/worldwind/formats/json/JSONDoc.java index b7712f44d0..ea01056b56 100644 --- a/src/gov/nasa/worldwind/formats/json/JSONDoc.java +++ b/src/gov/nasa/worldwind/formats/json/JSONDoc.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/JSONEvent.java b/src/gov/nasa/worldwind/formats/json/JSONEvent.java index 343cc309ab..6b2e607c4e 100644 --- a/src/gov/nasa/worldwind/formats/json/JSONEvent.java +++ b/src/gov/nasa/worldwind/formats/json/JSONEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/JSONEventParser.java b/src/gov/nasa/worldwind/formats/json/JSONEventParser.java index 9dbffd5bf5..f87080e620 100644 --- a/src/gov/nasa/worldwind/formats/json/JSONEventParser.java +++ b/src/gov/nasa/worldwind/formats/json/JSONEventParser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/JSONEventParserContext.java b/src/gov/nasa/worldwind/formats/json/JSONEventParserContext.java index 6fca56437d..3946bcf563 100644 --- a/src/gov/nasa/worldwind/formats/json/JSONEventParserContext.java +++ b/src/gov/nasa/worldwind/formats/json/JSONEventParserContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/json/NumericValueJSONEvent.java b/src/gov/nasa/worldwind/formats/json/NumericValueJSONEvent.java index 62052d9e20..3c0b160860 100644 --- a/src/gov/nasa/worldwind/formats/json/NumericValueJSONEvent.java +++ b/src/gov/nasa/worldwind/formats/json/NumericValueJSONEvent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.json; diff --git a/src/gov/nasa/worldwind/formats/nitfs/CompressionLookupRecord.java b/src/gov/nasa/worldwind/formats/nitfs/CompressionLookupRecord.java index c96e4882de..5d18a333bc 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/CompressionLookupRecord.java +++ b/src/gov/nasa/worldwind/formats/nitfs/CompressionLookupRecord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSDataExtensionSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSDataExtensionSegment.java index a18639f7a6..eba1b9742e 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSDataExtensionSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSDataExtensionSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSExtendedHeaderSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSExtendedHeaderSegment.java index 8df9843639..3c6534f1f4 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSExtendedHeaderSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSExtendedHeaderSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSFileHeader.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSFileHeader.java index 402f10bc97..dd49ba7440 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSFileHeader.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSFileHeader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSImageBand.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSImageBand.java index 5b56a0992b..6fc8df005d 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSImageBand.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSImageBand.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSImageSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSImageSegment.java index df5594d9c3..bd35db2f11 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSImageSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSImageSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSLabelSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSLabelSegment.java index df52dda2f8..3672447b14 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSLabelSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSLabelSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSMessage.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSMessage.java index 71976776cf..aea13439cf 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSMessage.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSMessage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSReservedExtensionSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSReservedExtensionSegment.java index 64351a2fce..ab019790aa 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSReservedExtensionSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSReservedExtensionSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSRuntimeException.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSRuntimeException.java index ece5b262f2..b3478763ef 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSRuntimeException.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSRuntimeException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSSegment.java index 496ebd278b..674c59db3a 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSSegmentType.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSSegmentType.java index 49ce68e211..0dbe0e22bb 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSSegmentType.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSSegmentType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSSymbolSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSSymbolSegment.java index e721f42db3..b085ffb2f3 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSSymbolSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSSymbolSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSTextSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSTextSegment.java index b9da384503..cdf63127ac 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSTextSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSTextSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSUserDefinedHeaderSegment.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSUserDefinedHeaderSegment.java index 9aaa1cd211..3efa15b509 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSUserDefinedHeaderSegment.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSUserDefinedHeaderSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/NITFSUtil.java b/src/gov/nasa/worldwind/formats/nitfs/NITFSUtil.java index b5118b0c47..b7b432e1f9 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/NITFSUtil.java +++ b/src/gov/nasa/worldwind/formats/nitfs/NITFSUtil.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nitfs/UserDefinedImageSubheader.java b/src/gov/nasa/worldwind/formats/nitfs/UserDefinedImageSubheader.java index 017cec8a39..56d5d229c8 100644 --- a/src/gov/nasa/worldwind/formats/nitfs/UserDefinedImageSubheader.java +++ b/src/gov/nasa/worldwind/formats/nitfs/UserDefinedImageSubheader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nitfs; diff --git a/src/gov/nasa/worldwind/formats/nmea/NmeaReader.java b/src/gov/nasa/worldwind/formats/nmea/NmeaReader.java index ed9fd8fec4..51b21cb104 100644 --- a/src/gov/nasa/worldwind/formats/nmea/NmeaReader.java +++ b/src/gov/nasa/worldwind/formats/nmea/NmeaReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nmea; @@ -53,9 +75,9 @@ public java.util.List getPoints() } /** - * @param path + * @param path The file spec to read. * @throws IllegalArgumentException if path is null - * @throws java.io.IOException + * @throws java.io.IOException if a read error occurs. */ public void readFile(String path) throws java.io.IOException { @@ -86,10 +108,10 @@ public void readFile(String path) throws java.io.IOException } /** - * @param stream - * @param name + * @param stream The stream to read from. + * @param name The name of the stream. * @throws IllegalArgumentException if stream is null - * @throws java.io.IOException + * @throws java.io.IOException if a read error occurs. */ public void readStream(java.io.InputStream stream, String name) throws java.io.IOException { diff --git a/src/gov/nasa/worldwind/formats/nmea/NmeaTrackPoint.java b/src/gov/nasa/worldwind/formats/nmea/NmeaTrackPoint.java index 205028fc05..bb5fa1b035 100644 --- a/src/gov/nasa/worldwind/formats/nmea/NmeaTrackPoint.java +++ b/src/gov/nasa/worldwind/formats/nmea/NmeaTrackPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nmea; @@ -22,7 +44,7 @@ public class NmeaTrackPoint implements TrackPoint private String time; /** - * @param words + * @param words The track point words to parse. * @throws IllegalArgumentException if words is null or has length less than 1 */ public NmeaTrackPoint(String[] words) @@ -125,7 +147,7 @@ public double getLatitude() } /** - * @param latitude + * @param latitude The new latitude. * @throws IllegalArgumentException if latitude is less than -90 or greater than 90 */ public void setLatitude(double latitude) @@ -146,7 +168,7 @@ public double getLongitude() } /** - * @param longitude + * @param longitude The new longitude. * @throws IllegalArgumentException if longitude is less than -180 or greater than 180 */ public void setLongitude(double longitude) diff --git a/src/gov/nasa/worldwind/formats/nmea/NmeaWriter.java b/src/gov/nasa/worldwind/formats/nmea/NmeaWriter.java index 5211724bda..a58f64967c 100644 --- a/src/gov/nasa/worldwind/formats/nmea/NmeaWriter.java +++ b/src/gov/nasa/worldwind/formats/nmea/NmeaWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.nmea; diff --git a/src/gov/nasa/worldwind/formats/rpf/Base34Converter.java b/src/gov/nasa/worldwind/formats/rpf/Base34Converter.java index b72f4ed606..a664dfa06d 100644 --- a/src/gov/nasa/worldwind/formats/rpf/Base34Converter.java +++ b/src/gov/nasa/worldwind/formats/rpf/Base34Converter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFBoundingRectangleSection.java b/src/gov/nasa/worldwind/formats/rpf/RPFBoundingRectangleSection.java index e8481b1a0f..203fc86e8e 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFBoundingRectangleSection.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFBoundingRectangleSection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFColorMap.java b/src/gov/nasa/worldwind/formats/rpf/RPFColorMap.java index 23bfc704d3..9fd1857fc0 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFColorMap.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFColorMap.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFCrawler.java b/src/gov/nasa/worldwind/formats/rpf/RPFCrawler.java index f58388c3bc..275666cbeb 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFCrawler.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFCrawler.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFDataSeries.java b/src/gov/nasa/worldwind/formats/rpf/RPFDataSeries.java index 5ce4406228..960d76841b 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFDataSeries.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFDataSeries.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFile.java b/src/gov/nasa/worldwind/formats/rpf/RPFFile.java index 44c8a1de62..b3ef503233 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFile.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFileComponents.java b/src/gov/nasa/worldwind/formats/rpf/RPFFileComponents.java index 85dcccd348..8ec53c8748 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFileComponents.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFileComponents.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileComponents.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileComponents.java index f8d5c6b7c6..dffc05574b 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileComponents.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileComponents.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileIndexSection.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileIndexSection.java index 729767c78f..e389cefcde 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileIndexSection.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFileIndexSection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilename.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilename.java index 63c803700e..adc3db00ed 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilename.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilename.java @@ -1,34 +1,54 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; import gov.nasa.worldwind.util.Logging; /** - * - *

    + * 
    
      * [ MIL-STD-2411, section 4.5.4.4]
      * a. All RPF [frame file] names shall be logically coded as follows:
      * [file name]
      *     {1}
    - *     , ascii: 8
    - *     , ascii: 1
    - *     , ascii: 3
    + *     'reference designator', ascii: 8
    + *     'period', ascii: 1
    + *     'data series and zone', ascii: 3
      *
      * d. [file name]s shall contain the following logical elements, listed in alphabetical order:
    - *     (1)  := a 3-byte ASCII character field...
    + *     (1) 'data series and zone' := a 3-byte ASCII character field...
      *     encoded as specified in MIL-STD-2411-1, section 5.1.5
      *
    - *     (2)  := a 1-byte ASCII character field := "."
    + *     (2) 'period' := a 1-byte ASCII character field := "."
      *
    - *     (3)  := an 8-byte ASCII character field...
    - *     Each byte of  shall have one of the following possible values:
    + *     (3) 'reference designator' := an 8-byte ASCII character field...
    + *     Each byte of 'reference designator' shall have one of the following possible values:
      *     any digit from 0 through 9; or any capital letter, A through Z, excluding I and O
    - * 
    - * + *
    * * @author dcollins * @version $Id: RPFFrameFilename.java 1171 2013-02-11 21:45:02Z dcollins $ diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilenameFormatException.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilenameFormatException.java index dc327b5d6d..d2ad53b670 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilenameFormatException.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameFilenameFormatException.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameProperty.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameProperty.java index ae7e4ba7d7..14df2da07e 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameProperty.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameProperty.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameStructure.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameStructure.java index c68622c795..aef2823b61 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameStructure.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameStructure.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFFrameTransform.java b/src/gov/nasa/worldwind/formats/rpf/RPFFrameTransform.java index b4c45968d7..1bcd85c1d4 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFFrameTransform.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFFrameTransform.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFHeaderSection.java b/src/gov/nasa/worldwind/formats/rpf/RPFHeaderSection.java index f80ed79572..8ba6cf4d55 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFHeaderSection.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFHeaderSection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFImageFile.java b/src/gov/nasa/worldwind/formats/rpf/RPFImageFile.java index 0b10523604..e411f0a95e 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFImageFile.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFImageFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFImageType.java b/src/gov/nasa/worldwind/formats/rpf/RPFImageType.java index 89de9abda2..b572cd938f 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFImageType.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFImageType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFLocationSection.java b/src/gov/nasa/worldwind/formats/rpf/RPFLocationSection.java index 0279a79e65..003ed2d8f4 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFLocationSection.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFLocationSection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameStructure.java b/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameStructure.java index 95ab524c09..7dc9d5a51e 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameStructure.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameStructure.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameTransform.java b/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameTransform.java index f71b25c7f3..0c7b192784 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameTransform.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFNonpolarFrameTransform.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameStructure.java b/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameStructure.java index 426ed4b7e1..d868b86273 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameStructure.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameStructure.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameTransform.java b/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameTransform.java index 96cc81fbd4..8c7ffe2cb7 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameTransform.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFPolarFrameTransform.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFProducer.java b/src/gov/nasa/worldwind/formats/rpf/RPFProducer.java index d474344c5a..ee8ce4cefa 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFProducer.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFProducer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFTOCFile.java b/src/gov/nasa/worldwind/formats/rpf/RPFTOCFile.java index 9723dbc62c..0ee22d1cd9 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFTOCFile.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFTOCFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFUserDefinedHeaderSegment.java b/src/gov/nasa/worldwind/formats/rpf/RPFUserDefinedHeaderSegment.java index 9542db67ae..396f52cb7e 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFUserDefinedHeaderSegment.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFUserDefinedHeaderSegment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/rpf/RPFZone.java b/src/gov/nasa/worldwind/formats/rpf/RPFZone.java index 4083403c19..9ed1db5a45 100644 --- a/src/gov/nasa/worldwind/formats/rpf/RPFZone.java +++ b/src/gov/nasa/worldwind/formats/rpf/RPFZone.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.rpf; diff --git a/src/gov/nasa/worldwind/formats/shapefile/DBaseField.java b/src/gov/nasa/worldwind/formats/shapefile/DBaseField.java index c95fa5498e..503b591b8c 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/DBaseField.java +++ b/src/gov/nasa/worldwind/formats/shapefile/DBaseField.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; diff --git a/src/gov/nasa/worldwind/formats/shapefile/DBaseFile.java b/src/gov/nasa/worldwind/formats/shapefile/DBaseFile.java index caf904b4d1..2e3180fc11 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/DBaseFile.java +++ b/src/gov/nasa/worldwind/formats/shapefile/DBaseFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -310,7 +332,7 @@ protected Header readHeader() throws IOException /** * Reads a {@link Header} instance from the given {@link java.nio.ByteBuffer}; - *

    + *

    * The buffer current position is assumed to be set at the start of the header and will be set to the end of the * header after this method has completed. * @@ -385,7 +407,7 @@ protected DBaseField[] readFields() throws IOException /** * Reads a sequence of {@link DBaseField} descriptions from the given {@link java.nio.ByteBuffer}; - *

    + *

    * The buffer current position is assumed to be set at the start of the sequence and will be set to the end of the * sequence after this method has completed. * @@ -440,7 +462,7 @@ protected DBaseRecord readNextRecord() throws IOException /** * Reads a {@link DBaseRecord} instance from the given {@link java.nio.ByteBuffer}; - *

    + *

    * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * diff --git a/src/gov/nasa/worldwind/formats/shapefile/DBaseRecord.java b/src/gov/nasa/worldwind/formats/shapefile/DBaseRecord.java index afcf0b7da3..aa3351854f 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/DBaseRecord.java +++ b/src/gov/nasa/worldwind/formats/shapefile/DBaseRecord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; diff --git a/src/gov/nasa/worldwind/formats/shapefile/Shapefile.java b/src/gov/nasa/worldwind/formats/shapefile/Shapefile.java index ecb9bb6707..3dca302b66 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/Shapefile.java +++ b/src/gov/nasa/worldwind/formats/shapefile/Shapefile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -26,10 +48,9 @@ /** * Parses an ESRI Shapefile (.shp) and provides access to its contents. For details on the Shapefile format see the ESRI * documentation at http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf. - *

    + *

    * The Shapefile provides a streaming interface for parsing a Shapefile's contents. The streaming interface enables - * applications to read Shapefiles that do not fit in memory. A typical usage pattern is as follows: - *

    + * applications to read Shapefiles that do not fit in memory. A typical usage pattern is as follows:
    
      * Object source = "MyShapefile.shp";
      * Shapefile sf = new Shapefile(source);
      * try
    @@ -44,27 +65,25 @@
      * {
      *     WWIO.closeStream(sf, source);
      * }
    - * 
    - * - *

    + *

    + *

    * The source Shapefile may be accompanied by an optional index file, attribute file, and projection file. Shapefile - * constructors that accept a generic source such as {@link #Shapefile(Object) expect accompanying files to be in the + * constructors that accept a generic source such as {@link #Shapefile(Object)} expect accompanying files to be in the * same logical folder as the Shapefile, have the same filename as the Shapefile, and have suffixes ".shx", ".dbf", and * ".prj" respectively. If any of these files do not exist, or cannot be read for any reason, the Shapefile opens * without that information. Alternatively, the Shapefile can be constructed by providing a direct {@link * java.io.InputStream} to any of the accompanying sources by using the InputStream based constructors, such as {@link * #Shapefile(java.io.InputStream, java.io.InputStream, java.io.InputStream, java.io.InputStream)}. - *

    *

    Coordinate System

    - *

    + *

    * The Shapefile's coordinate system affects how the Shapefile's point coordinates are interpreted as follows:

      *
    • Unspecified - coordinates are not changed.
    • Geographic - coordinates are validated during parsing. * Coordinates outside the standard range of +90/-90 latitude and +180/-180 longitude cause the Shapefile to throw an * exception during construction if the Shapefile's header contains an invalid coordinate, or in {@link * #readNextRecord()} if any of the Shapefile's records contain an invalid coordinate.
    • Universal Transverse * Mercator (UTM) - UTM coordinates are converted to geographic coordinates during parsing.
    • Unsupported - the - * Shapefile throws a {@link gov.nasa.worldwind.exception.WWRuntimeException} during construction. - *

      + * Shapefile throws a {@link gov.nasa.worldwind.exception.WWRuntimeException} during construction.

    + *

    * The Shapefile's coordinate system can be specified in either an accompanying projection file, or by specifying the * coordinate system parameters in an {@link gov.nasa.worldwind.avlist.AVList} during Shapefile's construction. The * Shapefile gives priority to the AVList if an accompanying projection file is available and AVList projection @@ -78,11 +97,12 @@ * an integer in the range 1-60.

  • {@link gov.nasa.worldwind.avlist.AVKey#PROJECTION_HEMISPHERE} - the UTM * hemisphere (if coordinate system is UTM); either {@link gov.nasa.worldwind.avlist.AVKey#NORTH} or {@link * gov.nasa.worldwind.avlist.AVKey#SOUTH}.
- *

+ *

* Subclasses can override how the Shapefile reads and interprets its coordinate system. Override {@link * #readCoordinateSystem()} and {@link #validateCoordinateSystem(gov.nasa.worldwind.avlist.AVList)} to change how the - * Shapefile parses an accompanying projection file and validates the coordinate system parameters. Override {@link - * #readBoundingRectangle(java.nio.ByteBuffer)} and {@link #readPoints(java.nio.ByteBuffer)} to change how the + * Shapefile parses an accompanying projection file and validates the coordinate system parameters. Override + * {@link #readBoundingRectangle(java.nio.ByteBuffer)} + * and {@link #readPoints(gov.nasa.worldwind.formats.shapefile.ShapefileRecord,java.nio.ByteBuffer)} to change how the * Shapefile's point coordinates are interpreted according to its coordinate system. * * @author Patrick Murris @@ -184,12 +204,12 @@ protected static class Header * java.io.InputStream}

  • {@link java.net.URL}
  • absolute {@link java.net.URI}
  • {@link * File}
  • {@link String} containing a valid URL description or a file or resource name available on the * classpath.
  • - *

    + *

    * The source Shapefile may be accompanied by an optional index file, attribute file, and projection file. To be * recognized by this Shapefile, accompanying files must be in the same logical folder as the Shapefile, have the * same filename as the Shapefile, and have suffixes ".shx", ".dbf", and ".prj" respectively. If any of these files * do not exist, or cannot be read for any reason, the Shapefile opens without that information. - *

    + *

    * This throws an exception if the shapefile's coordinate system is unsupported. * * @param source the source of the shapefile. @@ -240,12 +260,12 @@ else if (source instanceof String) * Opens an Shapefile from a general source. The source type may be one of the following:

    • {@link * java.io.InputStream}
    • {@link java.net.URL}
    • {@link File}
    • {@link String} containing a * valid URL description or a file or resource name available on the classpath.
    - *

    + *

    * The source Shapefile may be accompanied by an optional index file, attribute file, and projection file. To be * recognized by this Shapefile, accompanying files must be in the same logical folder as the Shapefile, have the * same filename as the Shapefile, and have suffixes ".shx", ".dbf", and ".prj" respectively. If any of these files * do not exist, or cannot be read for any reason, the Shapefile opens without that information. - *

    + *

    * This throws an exception if the shapefile's coordinate system is unsupported, or if the shapefile's coordinate * system is unsupported. * @@ -261,11 +281,11 @@ public Shapefile(Object source) /** * Opens a Shapefile from an InputStream, and InputStreams to its optional resources. - *

    + *

    * The source Shapefile may be accompanied optional streams to an index resource stream, an attribute resource * stream, and a projection resource stream. If any of these streams are null or cannot be read for any reason, the * Shapefile opens without that information. - *

    + *

    * This throws an exception if the shapefile's coordinate system is unsupported. * * @param shpStream the shapefile geometry file stream. @@ -303,11 +323,11 @@ public Shapefile(InputStream shpStream, InputStream shxStream, InputStream dbfSt /** * Opens a Shapefile from an InputStream, and InputStreams to its optional resources. - *

    + *

    * The source Shapefile may be accompanied optional streams to an index resource stream, an attribute resource * stream, and a projection resource stream. If any of these streams are null or cannot be read for any reason, the * Shapefile opens without that information. - *

    + *

    * This throws an exception if the shapefile's coordinate system is unsupported. * * @param shpStream the shapefile geometry file stream. @@ -326,11 +346,11 @@ public Shapefile(InputStream shpStream, InputStream shxStream, InputStream dbfSt /** * Opens a Shapefile from an InputStream, and InputStreams to its optional resources. - *

    + *

    * The source Shapefile may be accompanied optional streams to an index resource stream, and an attribute resource * stream. If any of these streams are null or cannot be read for any reason, the Shapefile opens without that * information. - *

    + *

    * This throws an exception if the shapefile's coordinate system is unsupported. * * @param shpStream the shapefile geometry file stream. @@ -349,7 +369,7 @@ public Shapefile(InputStream shpStream, InputStream shxStream, InputStream dbfSt /** * Opens a Shapefile from an InputStream, and InputStreams to its optional resources. - *

    + *

    * The source Shapefile may be accompanied optional streams to an index resource stream, and an attribute resource * stream. If any of these streams are null or cannot be read for any reason, the Shapefile opens without that * information. @@ -480,7 +500,7 @@ public boolean hasNext() *

  • {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecordPolyline} if type is {@link #SHAPE_POLYLINE}, * {@link #SHAPE_POLYLINE_M} or {@link #SHAPE_POLYLINE_Z}.
  • {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecordPolygon} * if type is {@link #SHAPE_POLYGON}, {@link #SHAPE_POLYGON_M} or {@link #SHAPE_POLYGON_Z}.
  • - *

    + *

    * This throws an exception if the JVM cannot allocate enough memory to hold the buffer used to store the record's * point coordinates. * @@ -535,7 +555,7 @@ record = this.readNextRecord(); * Closes the Shapefile, freeing any resources allocated during reading except the buffer containing the Shapefile's * points. This closes any {@link java.io.InputStream} passed to the Shapefile during construction. Subsequent calls * to {@link #nextRecord()} cause an IllegalStateException. - *

    + *

    * After closing, the Shapefile's header information and point coordinates are still available. The following * methods are safe to call:

    • {@link #getVersion()}
    • {@link #getLength()}
    • {@link * #getShapeType()}
    • {@link #getBoundingRectangle()}
    • {@link #getNumberOfRecords()}
    • {@link @@ -954,7 +974,7 @@ protected Header readHeader() throws IOException /** * Reads a {@link Header} instance from the given {@link java.nio.ByteBuffer}; - *

      + *

      * The buffer current position is assumed to be set at the start of the header and will be set to the end of the * header after this method has completed. * @@ -1268,7 +1288,7 @@ record = this.readRecordFromBuffer(buffer); /** * Reads a {@link ShapefileRecord} instance from the given {@link java.nio.ByteBuffer}, or null if the buffer * contains a null record. - *

      + *

      * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * @@ -1296,11 +1316,11 @@ protected ShapefileRecord readRecordFromBuffer(ByteBuffer buffer) * Returns a new {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecord} from the specified * buffer. The buffer's current position is assumed to be set at the start of the record and will be set to the * start of the next record after this method has completed. - *

      + *

      * This returns an instance of of ShapefileRecord appropriate for the record's shape type. For example, if the * record's shape type is SHAPE_POINT, this returns a ShapefileRecordPoint, and if the * record's shape type is SHAPE_NULL, this returns ShapefileRecordNull. - *

      + *

      * This returns null if the record's shape type is not one of the following types: * SHAPE_POINT, SHAPE_POINT_M, SHAPE_POINT_Z, SHAPE_MULTI_POINT, * SHAPE_MULTI_POINT_M, SHAPE_MULTI_POINT_Z, SHAPE_NULL, @@ -1343,7 +1363,7 @@ else if (isNullType(shapeType)) /** * Returns a new "null" {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecord} from the specified buffer. - *

      + *

      * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * @@ -1358,7 +1378,7 @@ protected ShapefileRecord createNull(ByteBuffer buffer) /** * Returns a new point {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecord} from the specified buffer. - *

      + *

      * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * @@ -1374,7 +1394,7 @@ protected ShapefileRecord createPoint(ByteBuffer buffer) /** * Returns a new multi-point {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecord} from the specified * buffer. - *

      + *

      * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * @@ -1389,7 +1409,7 @@ protected ShapefileRecord createMultiPoint(ByteBuffer buffer) /** * Returns a new polyline {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecord} from the specified buffer. - *

      + *

      * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * @@ -1404,7 +1424,7 @@ protected ShapefileRecord createPolyline(ByteBuffer buffer) /** * Returns a new polygon {@link gov.nasa.worldwind.formats.shapefile.ShapefileRecord} from the specified buffer. - *

      + *

      * The buffer current position is assumed to be set at the start of the record and will be set to the start of the * next record after this method has completed. * @@ -1630,7 +1650,7 @@ protected int computeNumberOfPointsEstimate() * This returns null if the buffer is null or if the buffer has no remaining elements. The returned coordinates are * interpreted according to the Shapefile's coordinate system. This throws a {@link * gov.nasa.worldwind.exception.WWRuntimeException} if the coordinate system is unsupported. - *

      + *

      * The buffer current position is assumed to be set at the start of the point data and will be set to the end of the * point data after this method has completed. * diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java index 26e924001b..92f4769e02 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -14,7 +36,7 @@ import gov.nasa.worldwind.terrain.Terrain; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.nio.*; import java.util.*; diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java index 88129c105b..578a945938 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -22,22 +44,19 @@ /** * A factory that creates {@link gov.nasa.worldwind.layers.Layer} instances from a shapefile layer configuration source * or a shapefile source. - *

      *

      Shapefile Geometry Conversion

      - *

      - * Shapefile geometries are mapped to World Wind objects as follows: - *

      - *
      Shapefile GeometryWorld Wind Object
      Point{@link + *

      + * Shapefile geometries are mapped to WorldWind objects as shown in the following table. + *
      WorldWind Shapefile Mapping
      Shapefile GeometryWorldWind Object
      Point{@link * gov.nasa.worldwind.render.PointPlacemark}
      MultiPointList of {@link * gov.nasa.worldwind.render.PointPlacemark}
      Polyline{@link * gov.nasa.worldwind.formats.shapefile.ShapefilePolylines}
      Polygon{@link * gov.nasa.worldwind.formats.shapefile.ShapefilePolygons}
      - *

      + *

      * In addition, if the DBase attributes file associated with the shapefile has an attribute named "height" or "hgt", the * shapes in the shapefile are mapped to {@link gov.nasa.worldwind.formats.shapefile.ShapefileExtrudedPolygons}. - *

      *

      Shapefile Attributes

      - *

      + *

      * Shapefiles may have associated with them a DBase attributes file. This class provides a mechanism for mapping * attribute names in the DBase file to keys assigned to the created shapes. The mapping is specified as key/value * pairs, the key is the attribute name in the shapefile's DBase attributes file, the value is the key name to attach to @@ -45,11 +64,11 @@ * fields in the DBase attributes may be mapped to a {@link gov.nasa.worldwind.avlist.AVKey#DISPLAY_NAME} key in the * av-list of the created shapes corresponding to each record. The mapping's key/value pairs are specified using {@link * #setDBaseMappings(gov.nasa.worldwind.avlist.AVList)}. - *

      + *

      * The rendering attributes applied to the created shapes may be specified to this class, either via the attribute * accessors of this class or a configuration file passed to {@link #createFromConfigSource(Object, * gov.nasa.worldwind.avlist.AVList)}. - *

      + *

      * The key-value attributes and the rendering attributes of certain created shapes may be specified programmatically * using a ShapefileRenderable.AttributeDelegate. The delegate is called for each shapefile record encountered during * parsing, after this factory applies its DBase attribute mapping and its default rendering attributes. Currently, @@ -209,7 +228,7 @@ public ShapefileRenderable.AttributeDelegate getAttributeDelegate() /** * Specifies an attribute delegate to call for each shapefile record encountered during parsing. The delegate is * called after this factory applies its DBase attribute mapping and its default rendering attributes. - *

      + *

      * Currently, attribute delegates are called when parsing shapefiles containing polylines, polygons or extruded * polygons. shapefiles containing points or multi-points ignore the attribute delegate. * @@ -249,10 +268,10 @@ public void assignAttributes(ShapefileRecord shapefileRecord, ShapefileRenderabl * the following:

      • a {@link java.net.URL}
      • a {@link java.io.File}
      • a {@link * java.io.InputStream}
      • {@link Element}
      • a {@link String} holding a file name, a name of a resource * on the classpath, or a string representation of a URL
      - *

      + *

      * The XML configuration file indicated by the source must contain the shapefile location, and may contain elements * specifying shapefile attribute mappings, shape attributes to assign to created shapes, and layer properties. - *

      + *

      * This returns with the new layer immediately, but executes shapefile parsing and shapefile geometry conversion on * a separate thread. Shapefile geometry is added to the returned layer as it becomes available. In order to receive * notifications when execution completes or if an exception occurs, use {@link #createFromConfigSource(Object, @@ -287,14 +306,14 @@ public Object createFromConfigSource(Object configSource, AVList params) * the following:

      • a {@link java.net.URL}
      • a {@link java.io.File}
      • a {@link * java.io.InputStream}
      • {@link Element}
      • a {@link String} holding a file name, a name of a resource * on the classpath, or a string representation of a URL
      - *

      + *

      * The XML configuration file indicated by the source must contain the shapefile location, and may contain elements * specifying shapefile attribute mappings, shape attributes to assign to created shapes, and layer properties. - *

      + *

      * This returns with the new layer immediately, but executes shapefile parsing and shapefile geometry conversion on * a separate thread. Shapefile geometry is added to the returned layer as it becomes available. Once parsing * completes, this calls the callback's completion method with the completed layer as the sole argument. - *

      + *

      * If an exception occurs during execution, this catches the exception and forwards it to the callback's exception * method. When an exception causes layer parsing or geometry conversion to fail, this calls the callback's * completion method before the separate thread terminates. @@ -349,13 +368,13 @@ public Object createFromConfigSource(Object configSource, AVList params, Complet * following:

      • a {@link java.net.URL}
      • a {@link java.io.File}
      • a {@link * java.io.InputStream}
      • {@link Shapefile}
      • a {@link String} holding a file name, a name of a * resource on the classpath, or a string representation of a URL
      - *

      + *

      * This returns with the new layer immediately, but executes shapefile parsing and shapefile geometry conversion on * a separate thread. Shapefile geometry is added to the returned layer as it becomes available. In order to receive * notifications when execution completes or if an exception occurs, use {@link #createFromConfigSource(Object, * gov.nasa.worldwind.avlist.AVList, gov.nasa.worldwind.formats.shapefile.ShapefileLayerFactory.CompletionCallback)} * and specify a completion callback. - *

      + *

      * If the source is a Shapefile instance, it is the responsibility of the caller to close the shapefile after this * factory completes execution. * @@ -384,15 +403,15 @@ public Object createFromShapefileSource(Object shapefileSource) * following:

      • a {@link java.net.URL}
      • a {@link java.io.File}
      • a {@link * java.io.InputStream}
      • {@link Shapefile}
      • a {@link String} holding a file name, a name of a * resource on the classpath, or a string representation of a URL
      - *

      + *

      * This returns with the new layer immediately, but executes shapefile parsing and shapefile geometry conversion on * a separate thread. Shapefile geometry is added to the returned layer as it becomes available. Once parsing * completes, this calls the callback's completion method with the completed layer as the sole argument. - *

      + *

      * If an exception occurs during execution, this catches the exception and forwards it to the callback's exception * method. When an exception causes layer parsing or geometry conversion to fail, this calls the callback's * completion method before the separate thread terminates. - *

      + *

      * If the source is a Shapefile instance, it is the responsibility of the caller to close the shapefile after this * factory completes execution. * diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java index ecc4ab4197..a82e6bb7c0 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -16,8 +38,8 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.util.combine.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import java.awt.*; import java.beans.*; import java.nio.*; @@ -465,7 +487,7 @@ public double getDetailHint() * Values greater than 0 cause shape detail to appear at higher resolution at greater altitudes than normal, but at * an increased performance cost. Values less than 0 decrease the default resolution at any given altitude. The * default value is 0. Values typically range between -0.5 and 0.5. - *

      + *

      * Note: The resolution-to-height relationship is defined by a scale factor that specifies the approximate size of * discernible lengths in the shape relative to eye distance. The scale is specified as a power of 10. A value of 3, * for example, specifies that a length of 1 meter on the shape should be distinguishable from an altitude of 10^3 @@ -502,7 +524,7 @@ public int getOutlinePickWidth() /** * Specifies the outline line width to use during picking. A larger width than normal typically makes the outline * easier to pick. - *

      + *

      * Note that the size of the pick aperture also affects the precision necessary to pick. * * @param outlinePickWidth the outline pick width. The default is 10. diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java index b6e45ddea0..12fb8b3fc4 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -15,7 +37,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.nio.*; import java.util.*; @@ -241,7 +263,7 @@ public int getOutlinePickWidth() /** * Specifies the outline line width to use during picking. A larger width than normal typically makes the outline * easier to pick. - *

      + *

      * Note that the size of the pick aperture also affects the precision necessary to pick. * * @param outlinePickWidth the outline pick width. The default is 10. diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecord.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecord.java index 6793174c4c..1b1e443dff 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecord.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -229,7 +251,7 @@ public CompoundVecBuffer getCompoundPointBuffer() /** * Returns a four-element array containing this record's bounding rectangle, or null if this record has no bounding * rectangle. - *

      + *

      * The returned array is ordered as follows: minimum Y, maximum Y, minimum X, and maximum X. If the Shapefile's * coordinate system is geographic, the elements can be interpreted as angular degrees in the order minimum * latitude, maximum latitude, minimum longitude, and maximum longitude. @@ -280,8 +302,8 @@ protected void readFromBuffer(Shapefile shapefile, ByteBuffer buffer) * records in a Shapefile must be of the same type. Throws an exception if the types do not match and the shape type * is not {@link Shapefile#SHAPE_NULL}. Records of type SHAPE_NULL are always valid, and * may appear in any Shapefile. - *

      - * For details, see the ESRI Shapefile specification at , + *

      + * For details, see the ESRI Shapefile specification at , * pages 4 and 5. * * @param shapefile the shapefile. diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordMultiPoint.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordMultiPoint.java index 09aff4f726..34c4aebeda 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordMultiPoint.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordMultiPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -13,7 +35,7 @@ /** * Represents a Shapefile record with a multi point shape type. Multi-point shapes represent a set of x,y coordinate * pairs. - *

      + *

      * Multi-points may have optional z-coordinates or m-coordinates that accompany each x,y coordinate pair. If a * Multi-point has z-coordinates, then {@link #getZValues()} returns a non-null array of * values. If a Multi-point has m-coordinates, then {@link #getMValues()} returns a non-null @@ -30,7 +52,17 @@ public class ShapefileRecordMultiPoint extends ShapefileRecord protected double[] mRange; // will be null if no measures protected double[] mValues; // will be null if no measures - /** {@inheritDoc} */ + /** + * Constructs a record instance from the given {@link java.nio.ByteBuffer}. The buffer's current position must be + * the start of the record, and will be the start of the next record when the constructor returns. + * + * @param shapeFile the parent {@link Shapefile}. + * @param buffer the shapefile record {@link java.nio.ByteBuffer} to read from. + * + * @throws IllegalArgumentException if any argument is null or otherwise invalid. + * @throws gov.nasa.worldwind.exception.WWRuntimeException + * if the record's shape type does not match that of the shapefile. + */ public ShapefileRecordMultiPoint(Shapefile shapeFile, ByteBuffer buffer) { super(shapeFile, buffer); diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordNull.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordNull.java index 599422247f..2c7c72f65f 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordNull.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordNull.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -17,7 +39,17 @@ */ public class ShapefileRecordNull extends ShapefileRecord { - /** {@inheritDoc} */ + /** + * Constructs a record instance from the given {@link java.nio.ByteBuffer}. The buffer's current position must be + * the start of the record, and will be the start of the next record when the constructor returns. + * + * @param shapeFile the parent {@link Shapefile}. + * @param buffer the shapefile record {@link java.nio.ByteBuffer} to read from. + * + * @throws IllegalArgumentException if any argument is null or otherwise invalid. + * @throws gov.nasa.worldwind.exception.WWRuntimeException + * if the record's shape type does not match that of the shapefile. + */ public ShapefileRecordNull(Shapefile shapeFile, ByteBuffer buffer) { super(shapeFile, buffer); diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPoint.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPoint.java index 57eecc08e2..cade2cba9b 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPoint.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -13,7 +35,7 @@ /** * Represents a Shapefile record with a point shape type. Point shapes represent a single x,y coordinate pair. - *

      + *

      * Point shapes may have an optional z-coordinate or m-coordinate that accompanies the x,y coordinate pair. If a Point * has a z-coordinate, then {@link #getZ()} returns a non-null value. If a Point has an * m-coordinate, then {@link #getM()} returns a non-null value. @@ -26,7 +48,17 @@ public class ShapefileRecordPoint extends ShapefileRecord protected Double z; // non-null only for Z types protected Double m; // non-null only for Measure types with measures specified - /** {@inheritDoc} */ + /** + * Constructs a record instance from the given {@link java.nio.ByteBuffer}. The buffer's current position must be + * the start of the record, and will be the start of the next record when the constructor returns. + * + * @param shapeFile the parent {@link Shapefile}. + * @param buffer the shapefile record {@link java.nio.ByteBuffer} to read from. + * + * @throws IllegalArgumentException if any argument is null or otherwise invalid. + * @throws gov.nasa.worldwind.exception.WWRuntimeException + * if the record's shape type does not match that of the shapefile. + */ public ShapefileRecordPoint(Shapefile shapeFile, ByteBuffer buffer) { super(shapeFile, buffer); diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolygon.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolygon.java index 8cf8bdc5c5..8e1077191b 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolygon.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolygon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -20,7 +42,7 @@ * more x,y coordinate pairs that form a closed loop. Polygon shapes may contain multiple rings, where each ring is a * closed loop of four or more points. Rings defining a filled part of a polygon have a clockwise winding order, while * rings defining holes in the polygon have a counter-clockwise winding order. - *

      + *

      * Polygons may have optional z-coordinates or m-coordinates that accompany each coordinate pair. If a Polygon has * z-coordinates, then {@link #getZValues()} returns a non-null array of values. If a Polygon * has m-coordinates, then {@link #getMValues()} returns a non-null array of values. @@ -30,7 +52,17 @@ */ public class ShapefileRecordPolygon extends ShapefileRecordPolyline { - /** {@inheritDoc} */ + /** + * Constructs a record instance from the given {@link java.nio.ByteBuffer}. The buffer's current position must be + * the start of the record, and will be the start of the next record when the constructor returns. + * + * @param shapeFile the parent {@link Shapefile}. + * @param buffer the shapefile record {@link java.nio.ByteBuffer} to read from. + * + * @throws IllegalArgumentException if any argument is null or otherwise invalid. + * @throws gov.nasa.worldwind.exception.WWRuntimeException + * if the record's shape type does not match that of the shapefile. + */ public ShapefileRecordPolygon(Shapefile shapeFile, ByteBuffer buffer) { super(shapeFile, buffer); diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolyline.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolyline.java index 873a72f695..a3f2bf4574 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolyline.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordPolyline.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -17,7 +39,7 @@ * Represents a Shapefile record with a polyline shape type. Polyline shapes represent an connected sequence of two or * more x,y coordinate pairs. Polyline shapes may contain multiple parts, where each part is an independent connected * sequence of two or more points. - *

      + *

      * Polylines may have optional z-coordinates or m-coordinates that accompany each coordinate pair. If a Polyline has * z-coordinates, then {@link #getZValues()} returns a non-null array of values. If a * Polyline has m-coordinates, then {@link #getMValues()} returns a non-null array of values. @@ -33,7 +55,17 @@ public class ShapefileRecordPolyline extends ShapefileRecord protected double[] mRange; // will be null if no measures protected double[] mValues; // will be null if no measures - /** {@inheritDoc} */ + /** + * Constructs a record instance from the given {@link java.nio.ByteBuffer}. The buffer's current position must be + * the start of the record, and will be the start of the next record when the constructor returns. + * + * @param shapeFile the parent {@link Shapefile}. + * @param buffer the shapefile record {@link java.nio.ByteBuffer} to read from. + * + * @throws IllegalArgumentException if any argument is null or otherwise invalid. + * @throws gov.nasa.worldwind.exception.WWRuntimeException + * if the record's shape type does not match that of the shapefile. + */ public ShapefileRecordPolyline(Shapefile shapeFile, ByteBuffer buffer) { super(shapeFile, buffer); diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRenderable.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRenderable.java index 008aaf0099..5cbe34e03a 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileRenderable.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileRenderable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; @@ -24,7 +46,7 @@ public abstract class ShapefileRenderable extends WWObjectImpl * AttributeDelegate provides an entry point for configuring a ShapefileRenderable.Record's shape attributes and * key-value attributes during ShapefileRenderable construction. In particular, the dBASE attributes associated with * a ShapefileRecord are available only during these entry points. - *

      + *

      * AttributeDelegate entry points may be called on a non-EDT thread. Implementations of AttributeDelegate may modify * the ShapefileRenderable.Record passed to these methods, but should not modify the ShapefileRenderable without * synchronizing access with the thread used to create the ShapefileRenderable. @@ -35,7 +57,7 @@ public interface AttributeDelegate * Entry point for configuring a ShapefileRenderable.Record's shape attributes and key-value attributes during * ShapefileRenderable construction. The ShapefileRecord's dBASE attributes are available only during the * execution of this method. - *

      + *

      * This method may be called on a non-EDT thread. Implementations may modify the renderableRecord, but should * not modify the ShapefileRenderable without synchronizing access with the thread used to create the * ShapefileRenderable. diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileUtils.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileUtils.java index 7a0e6212cc..db45c84240 100644 --- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileUtils.java +++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileUtils.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.shapefile; diff --git a/src/gov/nasa/worldwind/formats/tab/TABRasterReader.java b/src/gov/nasa/worldwind/formats/tab/TABRasterReader.java index b80bf61669..c54bcf4dbc 100644 --- a/src/gov/nasa/worldwind/formats/tab/TABRasterReader.java +++ b/src/gov/nasa/worldwind/formats/tab/TABRasterReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tab; @@ -11,7 +33,7 @@ /** * Reader for the MapInfo TAB file format. * Documentation on the MapInfo TAB format can be found here: - * http://community.mapinfo.com/forums/thread.jspa?messageID=23770& + * https://en.wikipedia.org/wiki/MapInfo_TAB_format * * @author dcollins * @version $Id: TABRasterReader.java 1171 2013-02-11 21:45:02Z dcollins $ diff --git a/src/gov/nasa/worldwind/formats/tiff/BaselineTiff.java b/src/gov/nasa/worldwind/formats/tiff/BaselineTiff.java index 9dbf43ec7b..ae093f717d 100644 --- a/src/gov/nasa/worldwind/formats/tiff/BaselineTiff.java +++ b/src/gov/nasa/worldwind/formats/tiff/BaselineTiff.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/GeoCodec.java b/src/gov/nasa/worldwind/formats/tiff/GeoCodec.java index d0562d8943..ec37838bbb 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeoCodec.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeoCodec.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; @@ -171,12 +193,12 @@ public double[] getBoundingBox(int width, int height) throws UnsupportedOperatio /** * Returns the geocoordinates for a given pixel, as determined by the modeling coordinate tranformation embodied in * the GeoCodec. - *

      + *

      * TODO: Also throws UnsupportedOperationException if this is anything other than a "simple" georeferenced mapping, * meaning that there's a single tie-point known about the point 0,0, we know the inter-pixel spacing, and there's * no rotation of the image required. Geo referencing may also be specified via a general 4x4 matrix, or by a list * if tie-points, implying a rubbersheeting transformation. These two cases remain to be implemented. - *

      + *

      * * @param row pixel-row index * @param col pixel-column index @@ -202,7 +224,7 @@ public double[] getXYAtPixel(int row, int col) throws UnsupportedOperationExcept /** * Gets the values of the given GeoKey as an array of ints. - *

      + *

      * While this method handles the general case of multiple ints associated with a key, typically there will be only a * single value. * diff --git a/src/gov/nasa/worldwind/formats/tiff/GeoTiff.java b/src/gov/nasa/worldwind/formats/tiff/GeoTiff.java index abece78ad2..bb97d036f0 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeoTiff.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeoTiff.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReader.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReader.java index b90ab87fec..a1aa064abc 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReader.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; @@ -585,7 +607,7 @@ private void readGeoKeys(TiffIFDEntry entry) throws IOException GeoKey key = new GeoKey(); key.key = keyValRec[i]; if (keyValRec[i + 1] == 0) - key.value = new Integer(keyValRec[i + 3]); + key.value = Integer.valueOf(keyValRec[i + 3]); else { // TODO: This isn't quite right.... diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReaderSpi.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReaderSpi.java index 33fd117d6f..452e738237 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReaderSpi.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffImageReaderSpi.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffMetaData.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffMetaData.java index 3e595fa507..8a3f9d8be4 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeotiffMetaData.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffMetaData.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffMetadataFormat.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffMetadataFormat.java index 361c56ccde..b9838f0277 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeotiffMetadataFormat.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffMetadataFormat.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffReader.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffReader.java index 63077ba0d9..63fdbda004 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeotiffReader.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffReader.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwind.formats.tiff; import gov.nasa.worldwind.Disposable; @@ -25,21 +46,20 @@ * @author brownrigg * @version $Id: GeotiffReader.java 3289 2015-06-30 15:55:33Z tgaskins $ */ -public class GeotiffReader implements Disposable -{ +public class GeotiffReader implements Disposable { + private TIFFReader tiffReader = null; private String sourceFilename; private RandomAccessFile sourceFile; private FileChannel theChannel; - private GeoCodec gc = new GeoCodec(); + private final GeoCodec gc = new GeoCodec(); private ArrayList tiffIFDs = null; private ArrayList metadata = null; - public GeotiffReader(String sourceFilename) throws IOException - { + public GeotiffReader(String sourceFilename) throws IOException { this.sourceFilename = sourceFilename; this.sourceFile = new RandomAccessFile(sourceFilename, "r"); this.theChannel = this.sourceFile.getChannel(); @@ -49,110 +69,81 @@ public GeotiffReader(String sourceFilename) throws IOException readTiffHeaders(); } - public GeotiffReader(File sourceFile) throws IOException - { + public GeotiffReader(File sourceFile) throws IOException { this(sourceFile.getAbsolutePath()); } - protected AVList getMetadata(int imageIndex) throws IOException - { + protected AVList getMetadata(int imageIndex) throws IOException { this.checkImageIndex(imageIndex); AVList values = this.metadata.get(imageIndex); return (null != values) ? values.copy() : null; } - public AVList copyMetadataTo(int imageIndex, AVList values) throws IOException - { + public AVList copyMetadataTo(int imageIndex, AVList values) throws IOException { AVList list = this.getMetadata(imageIndex); - if (null != values) - { + if (null != values) { values.setValues(list); - } - else - { + } else { values = list; } return values; } - public AVList copyMetadataTo(AVList list) throws IOException - { + public AVList copyMetadataTo(AVList list) throws IOException { return this.copyMetadataTo(0, list); } -// public AVList getMetadata() throws IOException -// { -// return this.getMetadata(0); -// } - - public void close() - { - try - { - this.sourceFile.close(); - } - catch (Exception ex) - { /* best effort */ } + public void close() { + this.dispose(); } - public int getNumImages() throws IOException - { + public int getNumImages() throws IOException { return (this.tiffIFDs != null) ? this.tiffIFDs.size() : 0; } - public int getWidth(int imageIndex) throws IOException - { + public int getWidth(int imageIndex) throws IOException { checkImageIndex(imageIndex); AVList values = this.metadata.get(imageIndex); return (values.hasKey(AVKey.WIDTH)) ? (Integer) values.getValue(AVKey.WIDTH) : 0; } - public int getHeight(int imageIndex) throws IOException - { + public int getHeight(int imageIndex) throws IOException { checkImageIndex(imageIndex); AVList values = this.metadata.get(imageIndex); return (values.hasKey(AVKey.HEIGHT)) ? (Integer) values.getValue(AVKey.HEIGHT) : 0; } - public DataRaster[] readDataRaster() throws IOException - { + public DataRaster[] readDataRaster() throws IOException { int num = this.getNumImages(); - if (num <= 0) - { + if (num <= 0) { return null; } DataRaster[] rasters = new DataRaster[num]; - for (int i = 0; i < num; i++) - { + for (int i = 0; i < num; i++) { rasters[i] = this.doRead(i); } return rasters; } - public DataRaster readDataRaster(int imageIndex) throws IOException - { + public DataRaster readDataRaster(int imageIndex) throws IOException { checkImageIndex(imageIndex); return this.doRead(imageIndex); } - public BufferedImage read() throws IOException - { + public BufferedImage read() throws IOException { return this.read(0); } - public BufferedImage read(int imageIndex) throws IOException - { + public BufferedImage read(int imageIndex) throws IOException { DataRaster raster = this.doRead(imageIndex); - if (null == raster) - { + if (null == raster) { return null; } - if (raster instanceof BufferedImageRaster) - { + if (raster instanceof BufferedImageRaster) { return ((BufferedImageRaster) raster).getBufferedImage(); } @@ -161,20 +152,17 @@ public BufferedImage read(int imageIndex) throws IOException throw new IOException(message); } - public boolean isGeotiff(int imageIndex) throws IOException - { + public boolean isGeotiff(int imageIndex) throws IOException { AVList values = this.metadata.get(imageIndex); return (null != values && values.hasKey(AVKey.COORDINATE_SYSTEM)); } - public DataRaster doRead(int imageIndex) throws IOException - { + public DataRaster doRead(int imageIndex) throws IOException { checkImageIndex(imageIndex); AVList values = this.metadata.get(imageIndex); // Extract the various IFD tags we need to read this image. We want to loop over the tag set once, instead // multiple times if we simply used our general getByTag() method. - long[] stripOffsets = null; byte[][] cmap = null; long[] stripCounts = null; @@ -185,68 +173,58 @@ public DataRaster doRead(int imageIndex) throws IOException BaselineTiff tiff = BaselineTiff.extract(ifd, this.tiffReader); - if (null == tiff) - { + if (null == tiff) { String message = Logging.getMessage("GeotiffReader.BadGeotiff"); Logging.logger().severe(message); throw new IOException(message); } - if (tiff.width <= 0) - { + if (tiff.width <= 0) { String msg = Logging.getMessage("GeotiffReader.InvalidIFDEntryValue", tiff.width, - "width", Tiff.Tag.IMAGE_WIDTH); + "width", Tiff.Tag.IMAGE_WIDTH); Logging.logger().severe(msg); throw new IOException(msg); } - if (tiff.height <= 0) - { + if (tiff.height <= 0) { String msg = Logging.getMessage("GeotiffReader.InvalidIFDEntryValue", tiff.height, - "height", Tiff.Tag.IMAGE_LENGTH); + "height", Tiff.Tag.IMAGE_LENGTH); Logging.logger().severe(msg); throw new IOException(msg); } - if (tiff.samplesPerPixel <= Tiff.Undefined) - { + if (tiff.samplesPerPixel <= Tiff.Undefined) { String msg = Logging.getMessage("GeotiffReader.InvalidIFDEntryValue", tiff.samplesPerPixel, - "samplesPerPixel", Tiff.Tag.SAMPLES_PER_PIXEL); + "samplesPerPixel", Tiff.Tag.SAMPLES_PER_PIXEL); Logging.logger().severe(msg); throw new IOException(msg); } - if (tiff.photometric <= Tiff.Photometric.Undefined || tiff.photometric > Tiff.Photometric.YCbCr) - { + if (tiff.photometric <= Tiff.Photometric.Undefined || tiff.photometric > Tiff.Photometric.YCbCr) { String msg = Logging.getMessage("GeotiffReader.InvalidIFDEntryValue", tiff.photometric, - "PhotoInterpretation", Tiff.Tag.PHOTO_INTERPRETATION); + "PhotoInterpretation", Tiff.Tag.PHOTO_INTERPRETATION); Logging.logger().severe(msg); throw new IOException(msg); } - if (tiff.rowsPerStrip <= Tiff.Undefined) - { + if (tiff.rowsPerStrip <= Tiff.Undefined) { String msg = Logging.getMessage("GeotiffReader.InvalidIFDEntryValue", tiff.rowsPerStrip, - "RowsPerStrip", Tiff.Tag.ROWS_PER_STRIP); + "RowsPerStrip", Tiff.Tag.ROWS_PER_STRIP); Logging.logger().fine(msg); tiff.rowsPerStrip = Integer.MAX_VALUE; } if (tiff.planarConfig != Tiff.PlanarConfiguration.PLANAR - && tiff.planarConfig != Tiff.PlanarConfiguration.CHUNKY) - { + && tiff.planarConfig != Tiff.PlanarConfiguration.CHUNKY) { String msg = Logging.getMessage("GeotiffReader.InvalidIFDEntryValue", tiff.planarConfig, - "PhotoInterpretation", Tiff.Tag.PHOTO_INTERPRETATION); + "PhotoInterpretation", Tiff.Tag.PHOTO_INTERPRETATION); Logging.logger().severe(msg); throw new IOException(msg); } - for (TiffIFDEntry entry : ifd) - { - try - { - switch (entry.tag) - { + for (TiffIFDEntry entry : ifd) { + try { + switch (entry.tag) { case Tiff.Tag.STRIP_OFFSETS: stripOffsets = entry.getAsLongs(); break; @@ -259,22 +237,18 @@ public DataRaster doRead(int imageIndex) throws IOException cmap = this.tiffReader.readColorMap(entry); break; } - } - catch (IOException e) - { + } catch (IOException e) { Logging.logger().finest(e.toString()); } } - if (null == stripOffsets || 0 == stripOffsets.length) - { + if (null == stripOffsets || 0 == stripOffsets.length) { String message = Logging.getMessage("GeotiffReader.MissingRequiredTag", "StripOffsets"); Logging.logger().severe(message); throw new IOException(message); } - if (null == stripCounts || 0 == stripCounts.length) - { + if (null == stripCounts || 0 == stripCounts.length) { String message = Logging.getMessage("GeotiffReader.MissingRequiredTag", "StripCounts"); Logging.logger().severe(message); throw new IOException(message); @@ -282,151 +256,116 @@ public DataRaster doRead(int imageIndex) throws IOException TiffIFDEntry notToday = getByTag(ifd, Tiff.Tag.COMPRESSION); boolean lzwCompressed = false; - if (notToday != null && notToday.asLong() == Tiff.Compression.LZW) - { + if (notToday != null && notToday.asLong() == Tiff.Compression.LZW) { lzwCompressed = true; TiffIFDEntry predictorEntry = getByTag(ifd, Tiff.Tag.TIFF_PREDICTOR); - if ((predictorEntry != null) && (predictorEntry.asLong() != 0)) - { + if ((predictorEntry != null) && (predictorEntry.asLong() != 0)) { tiffDifferencing = true; } - } - else if (notToday != null && notToday.asLong() != Tiff.Compression.NONE) - { + } else if (notToday != null && notToday.asLong() != Tiff.Compression.NONE) { String message = Logging.getMessage("GeotiffReader.CompressionFormatNotSupported"); Logging.logger().severe(message); throw new IOException(message); } notToday = getByTag(ifd, Tiff.Tag.TILE_WIDTH); - if (notToday != null) - { + if (notToday != null) { String message = Logging.getMessage("GeotiffReader.NoTiled"); Logging.logger().severe(message); throw new IOException(message); } long offset = stripOffsets[0]; -// int sampleFormat = (null != tiff.sampleFormat) ? tiff.sampleFormat[0] : Tiff.Undefined; -// int bitsPerSample = (null != tiff.bitsPerSample) ? tiff.bitsPerSample[0] : Tiff.Undefined; - if (values.getValue(AVKey.PIXEL_FORMAT) == AVKey.ELEVATION) - { + if (values.getValue(AVKey.PIXEL_FORMAT) == AVKey.ELEVATION) { ByteBufferRaster raster = new ByteBufferRaster(tiff.width, tiff.height, - (Sector) values.getValue(AVKey.SECTOR), values); + (Sector) values.getValue(AVKey.SECTOR), values); - if (raster.getValue(AVKey.DATA_TYPE) == AVKey.INT8) - { + if (raster.getValue(AVKey.DATA_TYPE) == AVKey.INT8) { byte[][] data = this.tiffReader.readPlanar8(tiff.width, tiff.height, tiff.samplesPerPixel, - stripOffsets, stripCounts, tiff.rowsPerStrip); + stripOffsets, stripCounts, tiff.rowsPerStrip); int next = 0; - for (int y = 0; y < tiff.height; y++) - { - for (int x = 0; x < tiff.width; x++) - { + for (int y = 0; y < tiff.height; y++) { + for (int x = 0; x < tiff.width; x++) { raster.setDoubleAtPosition(y, x, (double) data[0][next++]); } } - } - else if (raster.getValue(AVKey.DATA_TYPE) == AVKey.INT16) - { + } else if (raster.getValue(AVKey.DATA_TYPE) == AVKey.INT16) { short[][] data = this.tiffReader.readPlanar16(tiff.width, tiff.height, tiff.samplesPerPixel, - stripOffsets, stripCounts, tiff.rowsPerStrip); + stripOffsets, stripCounts, tiff.rowsPerStrip); int next = 0; - for (int y = 0; y < tiff.height; y++) - { - for (int x = 0; x < tiff.width; x++) - { - raster.setDoubleAtPosition(y, x, (double) data[0][next++] ); + for (int y = 0; y < tiff.height; y++) { + for (int x = 0; x < tiff.width; x++) { + raster.setDoubleAtPosition(y, x, (double) data[0][next++]); } } - } - else if (raster.getValue(AVKey.DATA_TYPE) == AVKey.FLOAT32) - { + } else if (raster.getValue(AVKey.DATA_TYPE) == AVKey.FLOAT32) { float[][] data = this.tiffReader.readPlanarFloat32(tiff.width, tiff.height, tiff.samplesPerPixel, - stripOffsets, stripCounts, tiff.rowsPerStrip); + stripOffsets, stripCounts, tiff.rowsPerStrip); int next = 0; - for (int y = 0; y < tiff.height; y++) - { - for (int x = 0; x < tiff.width; x++) - { + for (int y = 0; y < tiff.height; y++) { + for (int x = 0; x < tiff.width; x++) { raster.setDoubleAtPosition(y, x, (double) data[0][next++]); } } - } - else - { + } else { String message = Logging.getMessage("Geotiff.UnsupportedDataTypeRaster", tiff.toString()); Logging.logger().severe(message); throw new IOException(message); } - ElevationsUtil.rectify( raster ); + ElevationsUtil.rectify(raster); return raster; - } - else if (values.getValue(AVKey.PIXEL_FORMAT) == AVKey.IMAGE - && values.getValue(AVKey.IMAGE_COLOR_FORMAT) == AVKey.GRAYSCALE) - { + } else if (values.getValue(AVKey.PIXEL_FORMAT) == AVKey.IMAGE + && values.getValue(AVKey.IMAGE_COLOR_FORMAT) == AVKey.GRAYSCALE) { BufferedImage grayImage = null; - if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT8) - { + if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT8) { byte[][] image = this.tiffReader.readPlanar8(tiff.width, tiff.height, tiff.samplesPerPixel, - stripOffsets, stripCounts, tiff.rowsPerStrip); + stripOffsets, stripCounts, tiff.rowsPerStrip); grayImage = new BufferedImage(tiff.width, tiff.height, BufferedImage.TYPE_BYTE_GRAY); WritableRaster wrRaster = grayImage.getRaster(); int next = 0; - for (int y = 0; y < tiff.height; y++) - { - for (int x = 0; x < tiff.width; x++) - { + for (int y = 0; y < tiff.height; y++) { + for (int x = 0; x < tiff.width; x++) { wrRaster.setSample(x, y, 0, 0xFF & (int) (image[0][next++])); } } - } - else if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT16 && tiff.samplesPerPixel == 1) - { + } else if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT16 && tiff.samplesPerPixel == 1) { short[][] image = this.tiffReader.readPlanar16(tiff.width, tiff.height, tiff.samplesPerPixel, - stripOffsets, stripCounts, tiff.rowsPerStrip); + stripOffsets, stripCounts, tiff.rowsPerStrip); grayImage = new BufferedImage(tiff.width, tiff.height, BufferedImage.TYPE_USHORT_GRAY); WritableRaster wrRaster = grayImage.getRaster(); int next = 0; - for (int y = 0; y < tiff.height; y++) - { - for (int x = 0; x < tiff.width; x++) - { + for (int y = 0; y < tiff.height; y++) { + for (int x = 0; x < tiff.width; x++) { wrRaster.setSample(x, y, 0, 0xFFFF & (int) (image[0][next++])); } } - } - else if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT16 && tiff.samplesPerPixel > 1) - { + } else if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT16 && tiff.samplesPerPixel > 1) { short[] image = this.tiffReader.read16bitPixelInterleavedImage(imageIndex, tiff.width, tiff.height, - tiff.samplesPerPixel, stripOffsets, stripCounts, tiff.rowsPerStrip); + tiff.samplesPerPixel, stripOffsets, stripCounts, tiff.rowsPerStrip); grayImage = new BufferedImage(tiff.width, tiff.height, BufferedImage.TYPE_USHORT_GRAY); WritableRaster wrRaster = grayImage.getRaster(); int next = 0; - for (int y = 0; y < tiff.height; y++) - { - for (int x = 0; x < tiff.width; x++) - { + for (int y = 0; y < tiff.height; y++) { + for (int x = 0; x < tiff.width; x++) { wrRaster.setSample(x, y, 0, 0xFFFF & (int) (image[next++])); } } } - if (null == grayImage) - { + if (null == grayImage) { String message = Logging.getMessage("Geotiff.UnsupportedDataTypeRaster", tiff.toString()); Logging.logger().severe(message); throw new IOException(message); @@ -434,103 +373,77 @@ else if (values.getValue(AVKey.DATA_TYPE) == AVKey.INT16 && tiff.samplesPerPixel grayImage = ImageUtil.toCompatibleImage(grayImage); return BufferedImageRaster.wrap(grayImage, values); - } - else if (values.getValue(AVKey.PIXEL_FORMAT) == AVKey.IMAGE - && values.getValue(AVKey.IMAGE_COLOR_FORMAT) == AVKey.COLOR) - { + } else if (values.getValue(AVKey.PIXEL_FORMAT) == AVKey.IMAGE + && values.getValue(AVKey.IMAGE_COLOR_FORMAT) == AVKey.COLOR) { ColorModel colorModel = null; WritableRaster raster; BufferedImage colorImage; // make sure a DataBufferByte is going to do the trick - for (int bits : tiff.bitsPerSample) - { - if (bits != 8) - { + for (int bits : tiff.bitsPerSample) { + if (bits != 8) { String message = Logging.getMessage("GeotiffReader.Not8bit", bits); Logging.logger().warning(message); throw new IOException(message); } } - if (tiff.photometric == Tiff.Photometric.Color_RGB) - { + if (tiff.photometric == Tiff.Photometric.Color_RGB) { int transparency = Transparency.OPAQUE; boolean hasAlpha = false; - if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.RGB) - { + if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.RGB) { transparency = Transparency.OPAQUE; hasAlpha = false; - } - else if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.RGBA) - { + } else if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.RGBA) { transparency = Transparency.TRANSLUCENT; hasAlpha = true; } colorModel = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), tiff.bitsPerSample, - hasAlpha, false, transparency, DataBuffer.TYPE_BYTE); - } - else if (tiff.photometric == Tiff.Photometric.Color_Palette) - { + hasAlpha, false, transparency, DataBuffer.TYPE_BYTE); + } else if (tiff.photometric == Tiff.Photometric.Color_Palette) { colorModel = new IndexColorModel(tiff.bitsPerSample[0], cmap[0].length, cmap[0], cmap[1], cmap[2]); } - else if (tiff.photometric == Tiff.Photometric.CMYK) - { -// colorModel = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_), tiff.bitsPerSample, -// false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE); - } int[] bankOffsets = new int[tiff.samplesPerPixel]; - for (int i = 0; i < tiff.samplesPerPixel; i++) - { + for (int i = 0; i < tiff.samplesPerPixel; i++) { bankOffsets[i] = i; } int[] offsets = new int[(tiff.planarConfig == Tiff.PlanarConfiguration.CHUNKY) ? 1 : tiff.samplesPerPixel]; - for (int i = 0; i < offsets.length; i++) - { + for (int i = 0; i < offsets.length; i++) { offsets[i] = 0; } // construct the right SampleModel... ComponentSampleModel sampleModel; - if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.MONOCHROME) - { + if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.MONOCHROME) { sampleModel = new ComponentSampleModel(DataBuffer.TYPE_BYTE, tiff.width, tiff.height, 1, tiff.width, - bankOffsets); - } - else - { - sampleModel = (tiff.planarConfig == Tiff.PlanarConfiguration.CHUNKY) ? - new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE, tiff.width, tiff.height, tiff.samplesPerPixel, - tiff.width * tiff.samplesPerPixel, bankOffsets) : - new BandedSampleModel(DataBuffer.TYPE_BYTE, tiff.width, tiff.height, tiff.width, bankOffsets, - offsets); + bankOffsets); + } else { + sampleModel = (tiff.planarConfig == Tiff.PlanarConfiguration.CHUNKY) + ? new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE, tiff.width, tiff.height, tiff.samplesPerPixel, + tiff.width * tiff.samplesPerPixel, bankOffsets) + : new BandedSampleModel(DataBuffer.TYPE_BYTE, tiff.width, tiff.height, tiff.width, bankOffsets, + offsets); } // Get the image data and make our Raster... byte[][] imageData; - if (tiff.planarConfig == Tiff.PlanarConfiguration.CHUNKY) - { - if (lzwCompressed && (tiff.samplesPerPixel > 2)) - { + if (tiff.planarConfig == Tiff.PlanarConfiguration.CHUNKY) { + if (lzwCompressed && (tiff.samplesPerPixel > 2)) { imageData = new byte[1][tiff.width * tiff.height * tiff.samplesPerPixel]; imageData[0] = this.tiffReader.readLZWCompressed(tiff.width, tiff.height, offset, - tiff.samplesPerPixel, tiffDifferencing, stripOffsets, stripCounts); - } - else - { + tiff.samplesPerPixel, tiffDifferencing, stripOffsets, stripCounts); + } else { imageData = this.tiffReader.readPixelInterleaved8(tiff.width, tiff.height, tiff.samplesPerPixel, - stripOffsets, stripCounts); + stripOffsets, stripCounts); } - } - else - { + } else { imageData = this.tiffReader.readPlanar8(tiff.width, tiff.height, tiff.samplesPerPixel, stripOffsets, - stripCounts, tiff.rowsPerStrip); + stripCounts, tiff.rowsPerStrip); } DataBufferByte dataBuff = new DataBufferByte(imageData, tiff.width * tiff.height, offsets); @@ -538,8 +451,7 @@ else if (tiff.photometric == Tiff.Photometric.CMYK) colorImage = new BufferedImage(colorModel, raster, false, null); - if (null == colorImage) - { + if (null == colorImage) { String message = Logging.getMessage("Geotiff.UnsupportedDataTypeRaster", tiff.toString()); Logging.logger().severe(message); throw new IOException(message); @@ -556,16 +468,13 @@ else if (tiff.photometric == Tiff.Photometric.CMYK) /** * Returns true if georeferencing information was found in this file. - *

      + *

      * Note: see getGeoKeys() for determining if projection information is contained in the file. * * @throws java.io.IOException if data type is not supported or unknown */ - - private void repackageGeoReferencingTags() throws IOException - { - for (int i = 0; i < this.getNumImages(); i++) - { + private void repackageGeoReferencingTags() throws IOException { + for (int i = 0; i < this.getNumImages(); i++) { TiffIFDEntry[] ifd = tiffIFDs.get(i); AVList values = this.metadata.get(i); @@ -575,23 +484,20 @@ private void repackageGeoReferencingTags() throws IOException BaselineTiff tiff = BaselineTiff.extract(ifd, this.tiffReader); - if (null == tiff) - { + if (null == tiff) { String message = Logging.getMessage("GeotiffReader.BadGeotiff"); Logging.logger().severe(message); throw new IOException(message); } - if (tiff.width == Tiff.Undefined) - { + if (tiff.width == Tiff.Undefined) { String message = Logging.getMessage("generic.InvalidWidth", tiff.width); Logging.logger().severe(message); throw new IOException(message); } values.setValue(AVKey.WIDTH, tiff.width); - if (tiff.height == Tiff.Undefined) - { + if (tiff.height == Tiff.Undefined) { String message = Logging.getMessage("generic.InvalidHeight", tiff.height); Logging.logger().severe(message); throw new IOException(message); @@ -601,103 +507,71 @@ private void repackageGeoReferencingTags() throws IOException int sampleFormat = (null != tiff.sampleFormat) ? tiff.sampleFormat[0] : Tiff.Undefined; int bitsPerSample = (null != tiff.bitsPerSample) ? tiff.bitsPerSample[0] : Tiff.Undefined; - if (null != tiff.displayName) - { + if (null != tiff.displayName) { values.setValue(AVKey.DISPLAY_NAME, tiff.displayName); } - if (null != tiff.imageDescription) - { + if (null != tiff.imageDescription) { values.setValue(AVKey.DESCRIPTION, tiff.imageDescription); } - if (null != tiff.softwareVersion) - { + if (null != tiff.softwareVersion) { values.setValue(AVKey.VERSION, tiff.softwareVersion); } - if (null != tiff.dateTime) - { + if (null != tiff.dateTime) { values.setValue(AVKey.DATE_TIME, tiff.dateTime); } - if (tiff.photometric == Tiff.Photometric.Color_RGB) - { + if (tiff.photometric == Tiff.Photometric.Color_RGB) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.IMAGE); values.setValue(AVKey.IMAGE_COLOR_FORMAT, AVKey.COLOR); values.setValue(AVKey.DATA_TYPE, AVKey.INT8); - } - else if (tiff.photometric == Tiff.Photometric.CMYK) - { + } else if (tiff.photometric == Tiff.Photometric.CMYK) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.IMAGE); values.setValue(AVKey.IMAGE_COLOR_FORMAT, AVKey.COLOR); values.setValue(AVKey.DATA_TYPE, AVKey.INT8); - } - else if (tiff.photometric == Tiff.Photometric.Color_Palette) - { + } else if (tiff.photometric == Tiff.Photometric.Color_Palette) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.IMAGE); values.setValue(AVKey.IMAGE_COLOR_FORMAT, AVKey.COLOR); values.setValue(AVKey.DATA_TYPE, AVKey.INT8); - } - else if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.MONOCHROME) - { // Tiff.Photometric.Grayscale_BlackIsZero or Tiff.Photometric.Grayscale_WhiteIsZero - if (sampleFormat == Tiff.SampleFormat.SIGNED) - { + } else if (tiff.samplesPerPixel == Tiff.SamplesPerPixel.MONOCHROME) { // Tiff.Photometric.Grayscale_BlackIsZero or Tiff.Photometric.Grayscale_WhiteIsZero + if (sampleFormat == Tiff.SampleFormat.SIGNED) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.ELEVATION); - if (bitsPerSample == Short.SIZE) - { + if (bitsPerSample == Short.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.INT16); - } - else if (bitsPerSample == Byte.SIZE) - { + } else if (bitsPerSample == Byte.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.INT8); - } - else if (bitsPerSample == Integer.SIZE) - { + } else if (bitsPerSample == Integer.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.INT32); } - } - else if (sampleFormat == Tiff.SampleFormat.IEEEFLOAT) - { + } else if (sampleFormat == Tiff.SampleFormat.IEEEFLOAT) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.ELEVATION); - if (bitsPerSample == Float.SIZE) - { + if (bitsPerSample == Float.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.FLOAT32); } - } - else if (sampleFormat == Tiff.SampleFormat.UNSIGNED) - { + } else if (sampleFormat == Tiff.SampleFormat.UNSIGNED) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.IMAGE); values.setValue(AVKey.IMAGE_COLOR_FORMAT, AVKey.GRAYSCALE); - if (bitsPerSample == Short.SIZE) - { + if (bitsPerSample == Short.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.INT16); - } - else if (bitsPerSample == Byte.SIZE) - { + } else if (bitsPerSample == Byte.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.INT8); - } - else if (bitsPerSample == Integer.SIZE) - { + } else if (bitsPerSample == Integer.SIZE) { values.setValue(AVKey.DATA_TYPE, AVKey.INT32); } } } - if (!values.hasKey(AVKey.PIXEL_FORMAT) || !values.hasKey(AVKey.DATA_TYPE)) - { + if (!values.hasKey(AVKey.PIXEL_FORMAT) || !values.hasKey(AVKey.DATA_TYPE)) { String message = Logging.getMessage("Geotiff.UnsupportedDataTypeRaster", tiff.toString()); Logging.logger().severe(message); -// throw new IOException(message); } // geo keys - for (TiffIFDEntry entry : ifd) - { - try - { - switch (entry.tag) - { + for (TiffIFDEntry entry : ifd) { + try { + switch (entry.tag) { case GeoTiff.Tag.GDAL_NODATA: Double d = Double.parseDouble(this.tiffReader.readString(entry)); values.setValue(AVKey.MISSING_DATA_SIGNAL, d); @@ -735,9 +609,7 @@ else if (bitsPerSample == Integer.SIZE) this.gc.setAsciiParams(this.tiffReader.readBytes(entry)); break; } - } - catch (Exception e) - { + } catch (Exception e) { Logging.logger().finest(e.toString()); } } @@ -750,16 +622,12 @@ else if (bitsPerSample == Integer.SIZE) * Coordinates reading all the ImageFileDirectories in a Tiff file (there's typically only one). * */ - - private void readTiffHeaders() throws IOException - { - if (this.tiffIFDs != null) - { + private void readTiffHeaders() throws IOException { + if (this.tiffIFDs != null) { return; } - if (this.theChannel == null) - { + if (this.theChannel == null) { String message = Logging.getMessage("GeotiffReader.NullInputFile", this.sourceFilename); Logging.logger().severe(message); throw new IOException(message); @@ -774,10 +642,9 @@ private void readTiffHeaders() throws IOException byte b1 = array[1]; ByteOrder byteOrder = (b0 == 0x4D && b1 == 0x4D) ? ByteOrder.BIG_ENDIAN - : ((b0 == 0x49 && b1 == 0x49) ? ByteOrder.LITTLE_ENDIAN : null); + : ((b0 == 0x49 && b1 == 0x49) ? ByteOrder.LITTLE_ENDIAN : null); - if (null == byteOrder) - { + if (null == byteOrder) { String message = Logging.getMessage("GeotiffReader.BadTiffSig"); Logging.logger().severe(message); throw new IOException(message); @@ -801,19 +668,16 @@ private void readTiffHeaders() throws IOException this.repackageGeoReferencingTags(); } - private void processGeoKeys(int imageIndex) throws IOException - { + private void processGeoKeys(int imageIndex) throws IOException { this.checkImageIndex(imageIndex); AVList values = this.metadata.get(imageIndex); if (null == values - || null == this.gc - || !this.gc.hasGeoKey(GeoTiff.GeoKey.ModelType) - || !values.hasKey(AVKey.WIDTH) - || !values.hasKey(AVKey.HEIGHT) - ) - { + || null == this.gc + || !this.gc.hasGeoKey(GeoTiff.GeoKey.ModelType) + || !values.hasKey(AVKey.WIDTH) + || !values.hasKey(AVKey.HEIGHT)) { return; } @@ -821,94 +685,62 @@ private void processGeoKeys(int imageIndex) throws IOException int height = (Integer) values.getValue(AVKey.HEIGHT); // geo-tiff spec requires the VerticalCSType to be present for elevations (but ignores its value) - if (this.gc.hasGeoKey(GeoTiff.GeoKey.VerticalCSType)) - { + if (this.gc.hasGeoKey(GeoTiff.GeoKey.VerticalCSType)) { values.setValue(AVKey.PIXEL_FORMAT, AVKey.ELEVATION); } - if (this.gc.hasGeoKey(GeoTiff.GeoKey.VerticalUnits)) - { + if (this.gc.hasGeoKey(GeoTiff.GeoKey.VerticalUnits)) { int[] v = this.gc.getGeoKeyAsInts(GeoTiff.GeoKey.VerticalUnits); int units = (null != v && v.length > 0) ? v[0] : GeoTiff.Undefined; - if (units == GeoTiff.Unit.Linear.Meter) - { + if (units == GeoTiff.Unit.Linear.Meter) { values.setValue(AVKey.ELEVATION_UNIT, AVKey.UNIT_METER); - } - else if (units == GeoTiff.Unit.Linear.Foot) - { + } else if (units == GeoTiff.Unit.Linear.Foot) { values.setValue(AVKey.ELEVATION_UNIT, AVKey.UNIT_FOOT); } } - if (this.gc.hasGeoKey(GeoTiff.GeoKey.RasterType)) - { + if (this.gc.hasGeoKey(GeoTiff.GeoKey.RasterType)) { int[] v = this.gc.getGeoKeyAsInts(GeoTiff.GeoKey.RasterType); int rasterType = (null != v && v.length > 0) ? v[0] : GeoTiff.Undefined; - if (rasterType == GeoTiff.RasterType.RasterPixelIsArea) - { + if (rasterType == GeoTiff.RasterType.RasterPixelIsArea) { values.setValue(AVKey.RASTER_PIXEL, AVKey.RASTER_PIXEL_IS_AREA); - } - else if (rasterType == GeoTiff.RasterType.RasterPixelIsPoint) - { + } else if (rasterType == GeoTiff.RasterType.RasterPixelIsPoint) { values.setValue(AVKey.RASTER_PIXEL, AVKey.RASTER_PIXEL_IS_POINT); } } - if (this.gc.hasGeoKey(GeoTiff.GeoKey.GeogAngularUnits)) - { -// int[] v = this.gc.getGeoKeyAsInts( GeoTiff.GeoKey.GeogAngularUnits ); -// int unit = ( null != v && v.length > 0 ) ? v[0] : GeoTiff.Undefined; -// -// if( unit == GeoTiff.Unit.Angular.Angular_Degree ) -// else if( unit == GeoTiff.Unit.Angular.Angular_Radian ) - } - -// AVKey.PROJECTION_DATUM Optional, -// AVKey.PROJECTION_DESC Optional, -// AVKey.PROJECTION_NAME Optional, -// AVKey.PROJECTION_UNITS Optional, - int gtModelTypeGeoKey = GeoTiff.ModelType.Undefined; - if (this.gc.hasGeoKey(GeoTiff.GeoKey.ModelType)) - { + if (this.gc.hasGeoKey(GeoTiff.GeoKey.ModelType)) { int[] gkValues = this.gc.getGeoKeyAsInts(GeoTiff.GeoKey.ModelType); - if (null != gkValues && gkValues.length > 0) - { + if (null != gkValues && gkValues.length > 0) { gtModelTypeGeoKey = gkValues[0]; } } - if (gtModelTypeGeoKey == GeoTiff.ModelType.Geographic) - { + if (gtModelTypeGeoKey == GeoTiff.ModelType.Geographic) { values.setValue(AVKey.COORDINATE_SYSTEM, AVKey.COORDINATE_SYSTEM_GEOGRAPHIC); int epsg = GeoTiff.GCS.Undefined; - if (this.gc.hasGeoKey(GeoTiff.GeoKey.GeographicType)) - { + if (this.gc.hasGeoKey(GeoTiff.GeoKey.GeographicType)) { int[] gkValues = this.gc.getGeoKeyAsInts(GeoTiff.GeoKey.GeographicType); - if (null != gkValues && gkValues.length > 0) - { + if (null != gkValues && gkValues.length > 0) { epsg = gkValues[0]; } } - if (epsg != GeoTiff.GCS.Undefined) - { + if (epsg != GeoTiff.GCS.Undefined) { values.setValue(AVKey.PROJECTION_EPSG_CODE, epsg); } // TODO Assumes WGS84(4326)- should we check for this ? - double[] bbox = this.gc.getBoundingBox(width, height); values.setValue(AVKey.SECTOR, Sector.fromDegrees(bbox[3], bbox[1], bbox[0], bbox[2])); values.setValue(AVKey.ORIGIN, LatLon.fromDegrees(bbox[1], bbox[0])); - } - else if (gtModelTypeGeoKey == GeoTiff.ModelType.Projected) - { + } else if (gtModelTypeGeoKey == GeoTiff.ModelType.Projected) { values.setValue(AVKey.COORDINATE_SYSTEM, AVKey.COORDINATE_SYSTEM_PROJECTED); int projection = GeoTiff.PCS.Undefined; @@ -916,22 +748,17 @@ else if (gtModelTypeGeoKey == GeoTiff.ModelType.Projected) int zone; int[] vals = null; - if (this.gc.hasGeoKey(GeoTiff.GeoKey.Projection)) - { + if (this.gc.hasGeoKey(GeoTiff.GeoKey.Projection)) { vals = this.gc.getGeoKeyAsInts(GeoTiff.GeoKey.Projection); - } - else if (this.gc.hasGeoKey(GeoTiff.GeoKey.ProjectedCSType)) - { + } else if (this.gc.hasGeoKey(GeoTiff.GeoKey.ProjectedCSType)) { vals = this.gc.getGeoKeyAsInts(GeoTiff.GeoKey.ProjectedCSType); } - if (null != vals && vals.length > 0) - { + if (null != vals && vals.length > 0) { projection = vals[0]; } - if (projection != GeoTiff.PCS.Undefined) - { + if (projection != GeoTiff.PCS.Undefined) { values.setValue(AVKey.PROJECTION_EPSG_CODE, projection); } @@ -941,54 +768,44 @@ else if (this.gc.hasGeoKey(GeoTiff.GeoKey.ProjectedCSType)) from http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.3.2 UTM (North) Format: 160zz UTM (South) Format: 161zz - */ - if ((projection >= 16100) && (projection <= 16199)) //UTM Zone South + */ + if ((projection >= 16100) && (projection <= 16199)) //UTM Zone South { hemi = AVKey.SOUTH; zone = projection - 16100; - } - else if ((projection >= 16000) && (projection <= 16099)) //UTM Zone North + } else if ((projection >= 16000) && (projection <= 16099)) //UTM Zone North { hemi = AVKey.NORTH; zone = projection - 16000; - } - else if ((projection >= 26900) && (projection <= 26999)) //UTM : NAD83 + } else if ((projection >= 26900) && (projection <= 26999)) //UTM : NAD83 { hemi = AVKey.NORTH; zone = projection - 26900; - } - else if ((projection >= 32201) && (projection <= 32260)) //UTM : WGS72 N + } else if ((projection >= 32201) && (projection <= 32260)) //UTM : WGS72 N { hemi = AVKey.NORTH; zone = projection - 32200; - } - else if ((projection >= 32301) && (projection <= 32360)) //UTM : WGS72 S + } else if ((projection >= 32301) && (projection <= 32360)) //UTM : WGS72 S { hemi = AVKey.SOUTH; zone = projection - 32300; - } - else if ((projection >= 32401) && (projection <= 32460)) //UTM : WGS72BE N + } else if ((projection >= 32401) && (projection <= 32460)) //UTM : WGS72BE N { hemi = AVKey.NORTH; zone = projection - 32400; - } - else if ((projection >= 32501) && (projection <= 32560)) //UTM : WGS72BE S + } else if ((projection >= 32501) && (projection <= 32560)) //UTM : WGS72BE S { hemi = AVKey.SOUTH; zone = projection - 32500; - } - else if ((projection >= 32601) && (projection <= 32660)) //UTM : WGS84 N + } else if ((projection >= 32601) && (projection <= 32660)) //UTM : WGS84 N { hemi = AVKey.NORTH; zone = projection - 32600; - } - else if ((projection >= 32701) && (projection <= 32760)) //UTM : WGS84 S + } else if ((projection >= 32701) && (projection <= 32760)) //UTM : WGS84 S { hemi = AVKey.SOUTH; zone = projection - 32700; - } - else - { + } else { String message = Logging.getMessage("generic.UnknownProjection", projection); Logging.logger().severe(message); // throw new IOException(message); @@ -1006,8 +823,7 @@ else if ((projection >= 32701) && (projection <= 32760)) //UTM : WGS84 S //shift to center GeoCodec.ModelTiePoint[] tps = this.gc.getTiePoints(); - if (null != tps && tps.length > imageIndex) - { + if (null != tps && tps.length > imageIndex) { GeoCodec.ModelTiePoint tp = tps[imageIndex]; double xD = tp.getX() + (pixelScaleX / 2d); @@ -1018,12 +834,9 @@ else if ((projection >= 32701) && (projection <= 32760)) //UTM : WGS84 S } values.setValue(AVKey.SECTOR, ImageUtil.calcBoundingBoxForUTM(values)); - } - else - { + } else { String msg = Logging.getMessage("Geotiff.UnknownGeoKeyValue", gtModelTypeGeoKey, GeoTiff.GeoKey.ModelType); Logging.logger().severe(msg); -// throw new IOException(msg); } } @@ -1035,27 +848,21 @@ else if ((projection >= 32701) && (projection <= 32760)) //UTM : WGS84 S * Calls itself recursively if additional IFDs are indicated. * */ - - private void readIFD(int numEntries) throws IOException - { - try - { - if (null == this.tiffIFDs) - { + private void readIFD(int numEntries) throws IOException { + try { + if (null == this.tiffIFDs) { this.tiffIFDs = new ArrayList(); } java.util.List ifd = new ArrayList(); - for (int i = 0; i < numEntries; i++) - { + for (int i = 0; i < numEntries; i++) { ifd.add(TIFFIFDFactory.create(this.theChannel, this.tiffReader.getByteOrder())); } TiffIFDEntry[] array = ifd.toArray(new TiffIFDEntry[ifd.size()]); this.tiffIFDs.add(array); - if (null == this.metadata) - { + if (null == this.metadata) { this.metadata = new ArrayList(); } this.metadata.add(new AVListImpl()); @@ -1066,17 +873,14 @@ private void readIFD(int numEntries) throws IOException // If there's another IFD in this file, go get it (recursively)... long nextIFDOffset = TIFFReader.getUnsignedInt(bb); - if (nextIFDOffset > 0) - { + if (nextIFDOffset > 0) { this.theChannel.position(nextIFDOffset); bb.clear().limit(2); this.theChannel.read(bb); bb.flip(); readIFD(bb.getShort()); } - } - catch (Exception ex) - { + } catch (Exception ex) { String message = Logging.getMessage("GeotiffReader.BadIFD", ex.getMessage()); Logging.logger().severe(message); throw new IOException(message); @@ -1086,14 +890,10 @@ private void readIFD(int numEntries) throws IOException /* * Returns the (first!) IFD-Entry with the given tag, or null if not found. * - */ - - private TiffIFDEntry getByTag(TiffIFDEntry[] ifd, int tag) - { - for (TiffIFDEntry anIfd : ifd) - { - if (anIfd.tag == tag) - { + */ + private TiffIFDEntry getByTag(TiffIFDEntry[] ifd, int tag) { + for (TiffIFDEntry anIfd : ifd) { + if (anIfd.tag == tag) { return anIfd; } } @@ -1105,11 +905,8 @@ private TiffIFDEntry getByTag(TiffIFDEntry[] ifd, int tag) * We throw an IllegalArgumentException if the index is not valid, otherwise, silently return. * */ - - private void checkImageIndex(int imageIndex) throws IOException - { - if (imageIndex < 0 || imageIndex >= getNumImages()) - { + private void checkImageIndex(int imageIndex) throws IOException { + if (imageIndex < 0 || imageIndex >= getNumImages()) { String message = Logging.getMessage("GeotiffReader.BadImageIndex", imageIndex, 0, getNumImages()); Logging.logger().severe(message); throw new IllegalArgumentException(message); @@ -1120,24 +917,15 @@ private void checkImageIndex(int imageIndex) throws IOException * Make sure we release this resource... * */ - public void dispose() - { - try - { + @Override + public void dispose() { + try { WWIO.closeStream(this.theChannel, this.sourceFilename); WWIO.closeStream(this.sourceFile, this.sourceFilename); - } - catch (Throwable t) - { + } catch (Throwable t) { String message = t.getMessage(); message = (WWUtil.isEmpty(message)) ? t.getCause().getMessage() : message; Logging.logger().log(java.util.logging.Level.FINEST, message, t); } } - - protected void finalize() throws Throwable - { - this.dispose(); - super.finalize(); - } -} \ No newline at end of file +} diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java index 9a59a32403..8590362c2d 100644 --- a/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java +++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; @@ -157,7 +179,7 @@ AVKey.PIXEL_FORMAT required (valid values: AVKey.ELEVATION | AVKey.IMAGE } AVKey.DATA_TYPE required for elevations only; valid values: AVKey.INT16, and AVKey.FLOAT32 - AVKey.VERSION optional, if missing a default will be used "NASA World Wind" + AVKey.VERSION optional, if missing a default will be used "NASA WorldWind" AVKey.DISPLAY_NAME, (String) optional, specifies a name of the document/image diff --git a/src/gov/nasa/worldwind/formats/tiff/TIFFIFDFactory.java b/src/gov/nasa/worldwind/formats/tiff/TIFFIFDFactory.java index 828271d3a3..99e7ab4cb4 100644 --- a/src/gov/nasa/worldwind/formats/tiff/TIFFIFDFactory.java +++ b/src/gov/nasa/worldwind/formats/tiff/TIFFIFDFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/TIFFReader.java b/src/gov/nasa/worldwind/formats/tiff/TIFFReader.java index 2000de600f..30a98aa668 100644 --- a/src/gov/nasa/worldwind/formats/tiff/TIFFReader.java +++ b/src/gov/nasa/worldwind/formats/tiff/TIFFReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/Tiff.java b/src/gov/nasa/worldwind/formats/tiff/Tiff.java index 1e149d965a..cfa0821aee 100644 --- a/src/gov/nasa/worldwind/formats/tiff/Tiff.java +++ b/src/gov/nasa/worldwind/formats/tiff/Tiff.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/tiff/TiffIFDEntry.java b/src/gov/nasa/worldwind/formats/tiff/TiffIFDEntry.java index ffdafb3f9f..eaa4eb2f22 100644 --- a/src/gov/nasa/worldwind/formats/tiff/TiffIFDEntry.java +++ b/src/gov/nasa/worldwind/formats/tiff/TiffIFDEntry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.tiff; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymAbbreviationProvider.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymAbbreviationProvider.java index 2dd51fb8c6..c9b644d75c 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymAbbreviationProvider.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymAbbreviationProvider.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymAssignment.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymAssignment.java index 9c6b5d4206..0048d82e21 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymAssignment.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymAssignment.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java index 39b7089c34..b91eb9dc79 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -15,13 +37,13 @@ /** * The GeoSymAttributeConverter application converts GeoSym line attributes, area attributes, and area patterns into a - * form usable by World Wind VPF shapes. Outputs to "gsac-out" a comma-separated-value (CSV) file containing line and + * form usable by WorldWind VPF shapes. Outputs to "gsac-out" a comma-separated-value (CSV) file containing line and * area attributes for VPF line and area shapes, and PNG images containing area patterns for VPF area shapes. - *

      + *

      * GeoSymAttributeConverter is used to build the VPF symbol JAR file vpf-symbols.jar. For instructions on * how to build vpf-symbols.jar, see the file VPF_README.txt, which is distributed in each - * World Wind release. - *

      + * WorldWind release. + *

      * Usage: java -cp worldwind.jar gov.nasa.worldwind.formats.vpf.GeoSymAttributeConverter [full path to * "GeoSymEd2Final/GRAPHICS/CTEXT"] * @@ -425,7 +447,7 @@ protected static void printUsage() System.out.println("GeoSymAttributeConverter"); System.out.println(); System.out.println("Converts GeoSym line attributes, area attributes, and area patterns into a form usable by"); - System.out.println("World Wind VPF shapes. Outputs to \"" + OUT_DIR + "\" a comma-separated-value file"); + System.out.println("WorldWind VPF shapes. Outputs to \"" + OUT_DIR + "\" a comma-separated-value file"); System.out.println("containing line and area attributes for VPF line and area shapes, and PNG files"); System.out.println("containing area patterns for VPF area shapes."); System.out.println(); diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpression.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpression.java index c88593c77d..93b27bf013 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpression.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpression.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpressionProvider.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpressionProvider.java index 55d3ad57a5..5b770ff9d6 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpressionProvider.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeExpressionProvider.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -99,7 +121,7 @@ public int compare(AVList a, AVList b) /** * See MIL-HDBK-857A, section 6.4. - *

      + *

      * Parses the specified queue of logical expression components according to the precendence rules specified in * MIL-HDBK-857A, returning a reference to a a live Expression which may be evaluated against any set of attribute * values. diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymColumn.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymColumn.java index 73f56666de..10ec2843d5 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymColumn.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymColumn.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymConstants.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymConstants.java index c26faf2299..b258951f11 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymConstants.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymStyleProvider.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymStyleProvider.java index 9b74724e88..7967e103d7 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymStyleProvider.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymStyleProvider.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymSupport.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymSupport.java index d96e9e8f98..f5c1302124 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymSupport.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -562,7 +584,7 @@ protected List doGetSymbolKeys(VPFFeatureClass featureCl * determine at least one "true" condition for a particular instance of a feature in the VPF dataset, there are * default CGMs provided in GeoSym for displaying that feature. The following table identifies which symbol should * be used to symbolize an "unknown" point, line, or area feature. - *

      + *

      * Note that the default symbols should only be placed under two conditions: 1. There is no row in the *sym.txt * file for the feature (fcode) 2. After evaluating all rows in the *sym.txt file for that fcode, there is no row * that results in an evaluation of "true". diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymTable.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymTable.java index 768f3f27a4..0f1e31ae27 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymTable.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymTable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymTableHeader.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymTableHeader.java index ddd3b4c8ab..59c4355341 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymTableHeader.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymTableHeader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/GeoSymTableReader.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymTableReader.java index 6009c13ad1..405aab854f 100644 --- a/src/gov/nasa/worldwind/formats/vpf/GeoSymTableReader.java +++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymTableReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/NIMAConstants.java b/src/gov/nasa/worldwind/formats/vpf/NIMAConstants.java index 0346234eea..27a5e34ebc 100644 --- a/src/gov/nasa/worldwind/formats/vpf/NIMAConstants.java +++ b/src/gov/nasa/worldwind/formats/vpf/NIMAConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/NIMAUtils.java b/src/gov/nasa/worldwind/formats/vpf/NIMAUtils.java index 03abbe7eee..5bb56e47bd 100644 --- a/src/gov/nasa/worldwind/formats/vpf/NIMAUtils.java +++ b/src/gov/nasa/worldwind/formats/vpf/NIMAUtils.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBasicDataBufferFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFBasicDataBufferFactory.java index 2785c28979..f149429c1b 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBasicDataBufferFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBasicDataBufferFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureClassFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureClassFactory.java index 6d7f1649d0..a7ae5f7c79 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureClassFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureClassFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureFactory.java index 86c1b84f50..999e782511 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBasicFeatureFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBasicPrimitiveDataFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFBasicPrimitiveDataFactory.java index 24282a9f23..725aa8238d 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBasicPrimitiveDataFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBasicPrimitiveDataFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBasicSymbolFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFBasicSymbolFactory.java index cd5fe47730..c6655ceaac 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBasicSymbolFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBasicSymbolFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -42,10 +64,11 @@ public void setStyleSupport(VPFSymbolSupport symbolSupport) } /** - * @param featureClass + * @param featureClass The feature class. * - * @return + * @return the symbols. */ + @Override public Collection createPointSymbols(VPFFeatureClass featureClass) { if (featureClass == null) @@ -65,9 +88,9 @@ public Collection createPointSymbols(VPFFeatureClass featur } /** - * @param featureClass + * @param featureClass The feature class. * - * @return + * @return The symbols. */ public Collection createLineSymbols(VPFFeatureClass featureClass) { @@ -88,9 +111,9 @@ public Collection createLineSymbols(VPFFeatureClass feature } /** - * @param featureClass + * @param featureClass The feature class. * - * @return + * @return The symbols. */ public Collection createAreaSymbols(VPFFeatureClass featureClass) { @@ -111,9 +134,9 @@ public Collection createAreaSymbols(VPFFeatureClass feature } /** - * @param featureClass + * @param featureClass The feature class. * - * @return + * @return The symbols. */ public Collection createTextSymbols(VPFFeatureClass featureClass) { @@ -134,9 +157,9 @@ public Collection createTextSymbols(VPFFeatureClass feature } /** - * @param featureClass + * @param featureClass The feature class. * - * @return + * @return The symbols. */ public Collection createComplexSymbols(VPFFeatureClass featureClass) { @@ -183,10 +206,12 @@ protected FeatureMap createFeatureMap(VPFFeatureClass featureClass) /** * From MIL-DTL-89045A, section 3.5.3.1.1: A point feature may be symbolized as either a point symbol or as a text * label or both. - *

      + *

      * From MIL-HDBK-857A, section 6.5.3.1: For point features (e.g., buoys, beacons, lights) that are composed of * several symbol components, displaying the components according to the row ids in the *sym.txt file will result in * the properly constructed composite symbol. + * @param featureMap The feature map. + * @param outCollection The symbols. */ protected void doCreatePointSymbols(FeatureMap featureMap, Collection outCollection) { @@ -214,6 +239,8 @@ protected void doCreatePointSymbols(FeatureMap featureMap, Collection /** * From MIL-DTL-89045A, section 3.5.3.1.1: A linear feature will be symbolized exclusively by a line symbol that may * or may not be labeled. + * @param featureMap The feature map. + * @param outCollection The symbols. */ protected void doCreateLineSymbols(FeatureMap featureMap, Collection outCollection) { @@ -241,12 +268,12 @@ protected void doCreateLineSymbols(FeatureMap featureMap, Collection /** * From MIL-DTL-89045A, section 3.5.3.1.1: An area feature may be symbolized by any combination of point, line, or * area symbol as well as with a text label. - *

      + *

      * From MIL-HDBK-857A, section 6.4.1.4: It is also possible for there to exist multiple symbology components for * area features. The most common situation is the need for the addition of the low accuracy symbol (see * 6.4.1.3.4). This situation is implemented in the same way as for points, with an additional row in the *sym.txt * table to control the placement of the low accuracy symbol. - *

      + *

      * It is also possible for the symbolization of an area feature to require multiple rows to specify the components * of the full area symbol. This situation will exist for those area features requiring both a solid fill and a * pattern fill. In this case, the two area symbols will be specified using two rows in the *sym.txt file with the @@ -254,17 +281,19 @@ protected void doCreateLineSymbols(FeatureMap featureMap, Collection * also requires a boundary and/or a centered point symbol, those symbols will be specified in the second row for * the area feature (along with the area pattern). Section 6.5 explains the ramifications of this approach in more * detail. - *

      + *

      * For these reasons, as well as for the placement of text labels (see section 6.4.1.5), it is crucial that * application software access all rows from the sym.txt file for a given product/delineation/feature code in order * to ensure full symbolization for any feature. - *

      + *

      * From MIL-HDBK-857A, section 6.5.3.2: There are some area features (e.g., Maritime Areas) that require both a * solid fill and one or more pattern fills. Since the areasym column can only contain a single CGM reference, * there is a separate row in the *sym.txt file for each of the area symbols, as well as for the line symbol and/or * point symbol that apply to the specific area feature. These multiple rows will have sequential row ids in the * *sym.txt file according to the order in which the symbols are to be displayed on the screen: solid fill, pattern * fill (may be more than one), linear boundary, centered point symbol (may be more than one). + * @param featureMap The feature map. + * @param outCollection The symbols. */ protected void doCreateAreaSymbols(FeatureMap featureMap, Collection outCollection) { @@ -301,8 +330,11 @@ protected void doCreateAreaSymbols(FeatureMap featureMap, Collection /** * From MIL-DTL-89045A, section 3.5.3.1.1: VPF products can contain a fourth type of feature known as a text - * feature. GeoSym does not include rules to display text features. The application software should refer to the + * feature.GeoSym does not include rules to display text features.The application software should refer to the * MIL-STD-2407 for information on how to display VPF text features. + * + * @param featureMap The feature map. + * @param outCollection The symbols. */ protected void doCreateTextSymbols(FeatureMap featureMap, Collection outCollection) { diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBoundingBox.java b/src/gov/nasa/worldwind/formats/vpf/VPFBoundingBox.java index f0d1813157..041ef366e0 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBoundingBox.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBoundingBox.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFBufferedRecordData.java b/src/gov/nasa/worldwind/formats/vpf/VPFBufferedRecordData.java index 6220b7f5cf..18462e2e15 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFBufferedRecordData.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFBufferedRecordData.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFConstants.java b/src/gov/nasa/worldwind/formats/vpf/VPFConstants.java index c7513eff72..67ecbae77c 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFConstants.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFCoverage.java b/src/gov/nasa/worldwind/formats/vpf/VPFCoverage.java index 3f0e1d2fef..5d96ae3d92 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFCoverage.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFCoverage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -13,7 +35,7 @@ import java.util.ArrayList; /** - * DIGEST Part 2, Annex C.2.2.2.3:
      A coverage is composed of features whose primitives maintain topological + * DIGEST Part 2, Annex C.2.2.2.3:
      A coverage is composed of features whose primitives maintain topological * relationships according to a level of topology (level 0, 1, 2, or 3) defined for the coverage. All of the file * structures that make up a coverage are stored in a directory or subdirectories of that directory. * diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFCoveragePanel.java b/src/gov/nasa/worldwind/formats/vpf/VPFCoveragePanel.java index 757f48b6df..d2fee4fa1b 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFCoveragePanel.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFCoveragePanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFDataBuffer.java b/src/gov/nasa/worldwind/formats/vpf/VPFDataBuffer.java index 7f01120ade..54e4330794 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFDataBuffer.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFDataBuffer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFDataBufferFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFDataBufferFactory.java index e67efa16f2..d81cc449f3 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFDataBufferFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFDataBufferFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFDataType.java b/src/gov/nasa/worldwind/formats/vpf/VPFDataType.java index e07759b213..4c59cf2864 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFDataType.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFDataType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFDatabase.java b/src/gov/nasa/worldwind/formats/vpf/VPFDatabase.java index b60ced7bca..19131755fd 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFDatabase.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFDatabase.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -13,7 +35,7 @@ import java.util.*; /** - * DIGEST Part 2, Annex C.2.2.2.5 and C.2.3.6:
      A database is a collection of related libraries and additional + * DIGEST Part 2, Annex C.2.2.2.5 and C.2.3.6:
      A database is a collection of related libraries and additional * tables. The library attribute table acts as a table of contents for the database. Database information is contained * in a database header table. Database level data quality information can be maintained in the data quality table. * diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFDatabaseFilter.java b/src/gov/nasa/worldwind/formats/vpf/VPFDatabaseFilter.java index c372c86248..10e259a6b9 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFDatabaseFilter.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFDatabaseFilter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeature.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeature.java index 0584854625..50aaaa3c30 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeature.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClass.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClass.java index a411d06084..6f85e44639 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClass.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClass.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassFactory.java index 532a31d2c3..0c464984da 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassSchema.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassSchema.java index b78780aea4..da598b300d 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassSchema.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureClassSchema.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureFactory.java index e15d8cfa15..4f55d0a9c2 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureTableFilter.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureTableFilter.java index 67c956876b..25e4d4a94e 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureTableFilter.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureTableFilter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureType.java b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureType.java index d9f71424bd..3d26c8154b 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFFeatureType.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFFeatureType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFLayer.java b/src/gov/nasa/worldwind/formats/vpf/VPFLayer.java index 888c6bc14b..d407b6a603 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFLayer.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFLegendSupport.java b/src/gov/nasa/worldwind/formats/vpf/VPFLegendSupport.java index 3df117f913..952a100866 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFLegendSupport.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFLegendSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFLibrary.java b/src/gov/nasa/worldwind/formats/vpf/VPFLibrary.java index 7e2f0c0717..78269d0761 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFLibrary.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFLibrary.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveData.java b/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveData.java index 6f2b6f12bd..6cc4e15b86 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveData.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveData.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveDataFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveDataFactory.java index 1c3c01ad9c..3babe62038 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveDataFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFPrimitiveDataFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFRecord.java b/src/gov/nasa/worldwind/formats/vpf/VPFRecord.java index 405dab2645..eb2a3e5a30 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFRecord.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFRecord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFRelation.java b/src/gov/nasa/worldwind/formats/vpf/VPFRelation.java index aba77bbee5..344d3fc3f1 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFRelation.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFRelation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java index 98097a7abb..0abe5310e1 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -11,8 +33,8 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import java.nio.IntBuffer; import java.util.*; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java index 9905acccef..0948053975 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.util.*; /** diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSymbol.java b/src/gov/nasa/worldwind/formats/vpf/VPFSymbol.java index 85daff6e52..5216c211be 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSymbol.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSymbol.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolAttributes.java b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolAttributes.java index 43ebb4ca99..900fc54fd1 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolAttributes.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolComparator.java b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolComparator.java index 679dffa501..c45e27ca85 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolComparator.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolComparator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -14,9 +36,9 @@ * the correct sequence, the GeoSym application software must allow for the definition of a display order for the * features being displayed. GeoSym uses four "nested" methods to define the order in which symbols should be * displayed. - *

      + *

      * 1. Display priority 2. Feature delineation 3. Order of rows in *sym.txt 4. Symbol type - *

      + *

      * 6.5.1 Display Priority. The first criterion to use to determine the order to display features is the display * priority. Each row in the *sym.txt file defines a display priority number to that specific feature/attribute. The * display priority is a value between 0 and 9, where 9 identifies the highest priority. A feature/attribute with a @@ -25,31 +47,31 @@ * corresponding S57 object class/attribute. The S52 lookup tables were then utilized to obtain the display priority * values assigned to each object class. For all other products, the display priority values were based on cartographic * experience with the corresponding hardcopy map/chart. - *

      + *

      * 6.5.2 Feature Delineation. Once the features to be displayed have been sorted based on display priority, they must * then be sorted by their delineation (area, line, point). If the display priority is equal among features, then the * "painter's algorithm" should be used to display the area features first, followed by the linear features and then the * point features. - *

      + *

      * 6.5.3 Order of Rows in *sym.txt. The third criterion that affects the display order is the order of the rows in the * fullsym.txt file. The order will be represented in the id column of each row. Row ids will always be serial but may * not necessarily be consecutive. Stated another way, the row ID for row N will always be less than the row ID for row * N+1. Symbology being displayed based on this criterion should be displayed based on the least row id to the greatest * row id. - *

      + *

      * 6.5.3.1 Point Features with Components. For point features (e.g., buoys, beacons, lights) that are composed of * several symbol components, displaying the components according to the row ids in the *sym.txt file will result in the * properly constructed composite symbol. Each symbol component is based on the value of a specific attribute and the * components will vary in display priority so should already have been sorted according to that value before examining * the row ids in the *sym.txt file. - *

      + *

      * 6.5.3.2 Area Features with Multiple Fills. There are some area features (e.g., Maritime Areas) that require both a * solid fill and one or more pattern fills. Since the areasym column can only contain a single CGM reference, there is * a separate row in the *sym.txt file for each of the area symbols, as well as for the line symbol and/or point symbol * that apply to the specific area feature. These multiple rows will have sequential row ids in the *sym.txt file * according to the order in which the symbols are to be displayed on the screen: solid fill, pattern fill (may be more * than one), linear boundary, centered point symbol (may be more than one). - *

      + *

      * 6.5.3.3 Features with Text Labels As a general rule, the display priority specified for a feature's text label(s) * is the highest value possible, regardless of the display priority assigned to the base feature. In DNC, all text * labels will have a display priority of 8 (per IHO S52). In all other products, text labels have a display priority @@ -59,7 +81,7 @@ * for that feature. Since the row(s) defining the text label(s) will always follow the row(s) defining the CGM symbols * for a feature, displaying the symbols and text labels according to their row ids (lowest to highest) in *sym.txt will * still result in the correct final symbology for a feature being displayed. - *

      + *

      * 6.5.4 Symbol Type. The final criterion for determining the order for symbol display applies only to area features. * Area features can be symbolized by any combination of centered point symbol, linear boundary, solid fill and/or * pattern fill. Except for the special case where an area feature's symbology requires both a solid and pattern @@ -79,10 +101,10 @@ public VPFSymbolComparator() } /** - * @param a - * @param b + * @param a Symbol to compare. + * @param b Symbol to compare. * - * @return + * @return The relationship between a and b. */ public int compare(VPFSymbol a, VPFSymbol b) { diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolFactory.java b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolFactory.java index ec908afadc..a4f187318e 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolFactory.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolKey.java b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolKey.java index 69e724dd25..e058f2e997 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolKey.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolKey.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolSupport.java b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolSupport.java index a8d4e27c9b..068a60f87f 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFSymbolSupport.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFSymbolSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFTableReader.java b/src/gov/nasa/worldwind/formats/vpf/VPFTableReader.java index af0b8c576e..82192050f5 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFTableReader.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFTableReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -387,7 +409,7 @@ public RecordIndex() /** * Returns the name of the Variable-length Index File associated with a specified table name. Note that this does - * not determine whether or not the index exists, it simply returns the abstract file name of the index.
      See + * not determine whether or not the index exists, it simply returns the abstract file name of the index.
      See * MIL-STD-2407, section 5.3.1.2 DIGEST Part 2, Annex C.2.3.1.2 * * @param tableName the table name to return an index name for. diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFTile.java b/src/gov/nasa/worldwind/formats/vpf/VPFTile.java index 4fd4a3bcf4..9789a045e2 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFTile.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFTile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFTripletId.java b/src/gov/nasa/worldwind/formats/vpf/VPFTripletId.java index 73050237b6..2848c67a21 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFTripletId.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFTripletId.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFUtils.java b/src/gov/nasa/worldwind/formats/vpf/VPFUtils.java index 7a48a1c68e..8d442f1ac4 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFUtils.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFUtils.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFWingedEdgeTraverser.java b/src/gov/nasa/worldwind/formats/vpf/VPFWingedEdgeTraverser.java index 833c49aa4e..e5335d799b 100644 --- a/src/gov/nasa/worldwind/formats/vpf/VPFWingedEdgeTraverser.java +++ b/src/gov/nasa/worldwind/formats/vpf/VPFWingedEdgeTraverser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.vpf; @@ -32,12 +54,14 @@ public VPFWingedEdgeTraverser() } /** - * Implementation of the Wiged-Edge Algorithm for ring primitives, described in DIGEST Part 2, Annex C2.4.3. Given a + * Implementation of the Wiged-Edge Algorithm for ring primitives, described in DIGEST Part 2, Annex C2.4.3.Given a * row from the ring primitive table, navigate the ring and edge primitive tables to construct the edge information * associated with the specified ring. * + * @param faceId The face. + * @param startEdgeId The start edge. * @param edgeInfoArray the edge primitive data. - * @param listener the ring edge listener, may be null. + * @param listener the ring edge listener, may be null. * * @return the number of edges composing the specified ring. */ diff --git a/src/gov/nasa/worldwind/formats/worldfile/WorldFile.java b/src/gov/nasa/worldwind/formats/worldfile/WorldFile.java index 2e8020ddd3..111be26e94 100644 --- a/src/gov/nasa/worldwind/formats/worldfile/WorldFile.java +++ b/src/gov/nasa/worldwind/formats/worldfile/WorldFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.worldfile; @@ -897,7 +919,7 @@ else if (s.startsWith("S") || s.startsWith("s")) /** * Checks if the source is accompanied by any world file - *

      + *

      * The source type may be one of the following:

      • {@link java.net.URL}
      • {@link java.net.URI}
      • *
      • {@link java.io.File}
      • {@link String} containing a valid URL description, a valid URI description, or * a valid path to a local file.
      @@ -931,7 +953,7 @@ public static boolean hasWorldFiles(Object source) /** * Reads and decodes world file for the source - *

      + *

      * The source type may be one of the following:

      • {@link java.net.URL}
      • {@link java.net.URI}
      • *
      • {@link java.io.File}
      • {@link String} containing a valid URL description, a valid URI description, or * a valid path to a local file.
      diff --git a/src/gov/nasa/worldwind/formats/wvt/WaveletCodec.java b/src/gov/nasa/worldwind/formats/wvt/WaveletCodec.java index 7c5d320c8e..0c84efb9ba 100644 --- a/src/gov/nasa/worldwind/formats/wvt/WaveletCodec.java +++ b/src/gov/nasa/worldwind/formats/wvt/WaveletCodec.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.formats.wvt; @@ -79,9 +101,9 @@ public final int getResolutionY() * Andrew Glassner * 1995, pp. 296 * - * @param resolution + * @param resolution The desired resolution. * @return reconstructed image. - * @throws IllegalArgumentException + * @throws IllegalArgumentException if resolution is not valid. */ public BufferedImage reconstruct(int resolution) throws IllegalArgumentException { @@ -321,9 +343,9 @@ public static WaveletCodec loadPartial(java.nio.ByteBuffer buffer, int resolutio * a power of 2. If the incoming image has at least 3 bands, the first three are assumed to be RGB channels. * If only one-band, it is assumed to be grayscale. The SampleModel component-type must be BYTE. * - * @param image - * @return - * @throws IllegalArgumentException + * @param image The source image. + * @return The wavelet encoding. + * @throws IllegalArgumentException if the image is invalid. */ public static WaveletCodec encode(BufferedImage image) throws IllegalArgumentException { diff --git a/src/gov/nasa/worldwind/geom/Angle.java b/src/gov/nasa/worldwind/geom/Angle.java index 1322d7864a..6c13e852e3 100644 --- a/src/gov/nasa/worldwind/geom/Angle.java +++ b/src/gov/nasa/worldwind/geom/Angle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -195,13 +217,13 @@ public static Angle fromDMdS(int degrees, double minutes) /** * Obtain an angle from a degrees, minute and seconds character string. - *

      eg:

      +     * 

      eg:

            * 123 34 42
            * -123* 34' 42" (where * stands for the degree symbol)
            * +45* 12' 30" (where * stands for the degree symbol)
            * 45 12 30 S
            * 45 12 30 N
      -     * 

      + *
      * For a string containing both a sign and compass direction, the compass direction will take precedence. * * @param dmsString the degrees, minute and second character string. @@ -579,11 +601,10 @@ public static Angle average(Angle a, Angle b, Angle c) /** * Limits a specified angle to be within a specified minimum and maximum. - *

      - * The returned angle is undefined if min > max. Otherwise, this method's return value is equivalent to the + *

      + * The returned angle is undefined if min > max. Otherwise, this method's return value is equivalent to the * following: - *

      - *

      • min - If value < min
      • max - If value > max
      • value - If min <= value <= max
      + *
      • min - If value < min
      • max - If value > max
      • value - If min <= value >= max
      * * @param value The angle to clamp. * @param min The minimum angle to clamp to. diff --git a/src/gov/nasa/worldwind/geom/BarycentricPlanarShape.java b/src/gov/nasa/worldwind/geom/BarycentricPlanarShape.java index 4e444be211..057c243f32 100644 --- a/src/gov/nasa/worldwind/geom/BarycentricPlanarShape.java +++ b/src/gov/nasa/worldwind/geom/BarycentricPlanarShape.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/BarycentricQuadrilateral.java b/src/gov/nasa/worldwind/geom/BarycentricQuadrilateral.java index 3a2f592785..6bede168af 100644 --- a/src/gov/nasa/worldwind/geom/BarycentricQuadrilateral.java +++ b/src/gov/nasa/worldwind/geom/BarycentricQuadrilateral.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/BarycentricTriangle.java b/src/gov/nasa/worldwind/geom/BarycentricTriangle.java index 592ce35b07..a6ee908cc5 100644 --- a/src/gov/nasa/worldwind/geom/BarycentricTriangle.java +++ b/src/gov/nasa/worldwind/geom/BarycentricTriangle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/BilinearInterpolator.java b/src/gov/nasa/worldwind/geom/BilinearInterpolator.java index 32be614984..39583fee55 100644 --- a/src/gov/nasa/worldwind/geom/BilinearInterpolator.java +++ b/src/gov/nasa/worldwind/geom/BilinearInterpolator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/Box.java b/src/gov/nasa/worldwind/geom/Box.java index e9bcec83b8..0fdd2c96d5 100644 --- a/src/gov/nasa/worldwind/geom/Box.java +++ b/src/gov/nasa/worldwind/geom/Box.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.util.*; /** @@ -18,6 +40,32 @@ * Box is defined by three orthogonal axes and two positions along each of those axes. Each of the * positions specifies the location of a box side along the respective axis. The three axes are named by convention "R", * "S" and "T", and are ordered by decreasing length -- R is the longest axis, followed by S and then T. + *

      + * The static class field, ProjectionHullTable, defines a table of all possible vertex combinations + * representing a Box's 2D convex hull in screen coordinates. The index to this table is a 6-bit code, + * where each bit denotes whether one of the Box's six planes faces the View. This code is + * organized as follows: + * + * + * + *
      Bit Mapping
      Bit543210
      Codeleftrightbackfrontbottomtop
      + *

      + * Since at most three of a Box's planes can be visible at one time, there are a total of 26 unique vertex + * combinations that define a Box's 2D convex hull in the viewport. Index codes that represent a valid + * combination of planes facing the View result in an array of 4 or 6 integers (depending on whether one, + * two or three planes face the View), where each element in the array is an index for one of the + * Box's eight vertices as follows: + * + * + * + * + * + * + *
      Index Mapping
      Index01234567
      Vertexbottom-lower-leftbottom-lower-rightbottom-upper-rightbottom-upper-lefttop-lower-lefttop-lower-righttop-upper-righttop-upper-left
      + *

      + * The vertices are organized so that they appear in counter-clockwise order on the screen. Index codes that represent + * an invalid combination of planes facing the View map to null. * * @author tag * @version $Id: Box.java 1171 2013-02-11 21:45:02Z dcollins $ @@ -25,35 +73,6 @@ public class Box implements Extent, Renderable { /** - * ProjectionHullTable defines a table of all possible vertex combinations representing a - * Box's 2D convex hull in screen coordinates. The index to this table is a 6-bit code, where each bit - * denotes whether one of the Box's six planes faces the View. This code is organized as - * follows: - *

      - *
      Bit543210
      Codeleftrightbackfrontbottomtop
      - *

      - * Since at most three of a Box's planes can be visible at one time, there are a total of 26 unique - * vertex combinations that define a Box's 2D convex hull in the viewport. Index codes that represent a - * valid combination of planes facing the View result in an array of 4 or 6 integers (depending on - * whether one, two or three planes face the View), where each element in the array is an index for one - * of the Box's eight vertices as follows: - *

      - *
      Index01234567
      Vertexbottom-lower-leftbottom-lower-rightbottom-upper-rightbottom-upper-lefttop-lower-lefttop-lower-righttop-upper-righttop-upper-left
      - *

      - * The vertices are organized so that they appear in counter-clockwise order on the screen. Index codes that - * represent an invalid combination of planes facing the View map to null. */ protected static final int[][] ProjectionHullTable = new int[][] { @@ -139,10 +158,10 @@ protected Box(Vec4 bottomCenter, Vec4 topCenter, Vec4 center, Vec4 r, Vec4 s, Ve * faces are specified by two scalar locations along each axis, each location indicating a face. The non-unit length * of an axis is the distance between its respective two locations. The longest side is specified first, followed by * the second longest side and then the shortest side. - *

      + *

      * The axes are normally principal axes computed from a collection of points in order to form an oriented bounding * volume. See {@link WWMath#computePrincipalAxes(Iterable)}. - *

      + *

      * Note: No check is made to ensure the order of the face locations. * * @param axes the unit-length axes. @@ -513,7 +532,7 @@ public static Box computeBoundingBox(Iterable points) /** * Computes a Box that bounds a specified buffer of points. Principal axes are computed for the points * and used to form a Box. - *

      + *

      * The buffer must contain XYZ coordinate tuples which are either tightly packed or offset by the specified stride. * The stride specifies the number of buffer elements between the first coordinate of consecutive tuples. For * example, a stride of 3 specifies that each tuple is tightly packed as XYZXYZXYZ, whereas a stride of 5 specifies @@ -890,7 +909,7 @@ public double getProjectedArea(View view) * view. The returned integer is a 6-bit code, where each bit denotes whether one of this * Box's six planes faces the View. See the documentation for {@link * #ProjectionHullTable} for details. - *

      + *

      * If the view is inside this Box, this returns 0 indicating that none of this * Box's planes face the view. * diff --git a/src/gov/nasa/worldwind/geom/Cylinder.java b/src/gov/nasa/worldwind/geom/Cylinder.java index eeb5e36964..c63dab0f39 100644 --- a/src/gov/nasa/worldwind/geom/Cylinder.java +++ b/src/gov/nasa/worldwind/geom/Cylinder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -10,8 +32,8 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import java.util.*; /** diff --git a/src/gov/nasa/worldwind/geom/Extent.java b/src/gov/nasa/worldwind/geom/Extent.java index 068d5bfee5..06453c8d91 100644 --- a/src/gov/nasa/worldwind/geom/Extent.java +++ b/src/gov/nasa/worldwind/geom/Extent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -97,7 +119,7 @@ public interface Extent * infinite plane defined by the view's viewport. This area is not limited to the size of the * view's viewport, and portions of this Extent are not clipped by the view's * frustum. - *

      + *

      * This returns Double.POSITIVE_INFINITY if the view's eye point is inside this * Extent, or if any portion of this Extent is behind the eye point. In either case, this * Extent has no finite projection on the view. diff --git a/src/gov/nasa/worldwind/geom/ExtentHolder.java b/src/gov/nasa/worldwind/geom/ExtentHolder.java index f704d986c8..427d05a25a 100644 --- a/src/gov/nasa/worldwind/geom/ExtentHolder.java +++ b/src/gov/nasa/worldwind/geom/ExtentHolder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/Frustum.java b/src/gov/nasa/worldwind/geom/Frustum.java index 5b94bb9250..8e642f087e 100644 --- a/src/gov/nasa/worldwind/geom/Frustum.java +++ b/src/gov/nasa/worldwind/geom/Frustum.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -9,7 +31,7 @@ /** * Represents a view frustum composed of six planes: left, right, bottom, top, near far. - *

      + *

      * Frustum instances are immutable. * * @author Tom Gaskins @@ -40,7 +62,7 @@ public Frustum() /** * Create a frustum from six {@link gov.nasa.worldwind.geom.Plane}s defining the frustum boundaries. - *

      + *

      * None of the arguments may be null. * * @param near the near plane diff --git a/src/gov/nasa/worldwind/geom/GeoQuad.java b/src/gov/nasa/worldwind/geom/GeoQuad.java index b5d1453464..d47c23378a 100644 --- a/src/gov/nasa/worldwind/geom/GeoQuad.java +++ b/src/gov/nasa/worldwind/geom/GeoQuad.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/Intersection.java b/src/gov/nasa/worldwind/geom/Intersection.java index 6f9f4d1c94..a395901896 100644 --- a/src/gov/nasa/worldwind/geom/Intersection.java +++ b/src/gov/nasa/worldwind/geom/Intersection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/LatLon.java b/src/gov/nasa/worldwind/geom/LatLon.java index 723e3aa90d..acc1e29a7b 100644 --- a/src/gov/nasa/worldwind/geom/LatLon.java +++ b/src/gov/nasa/worldwind/geom/LatLon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -14,7 +36,7 @@ /** * Represents a point on the two-dimensional surface of a globe. Latitude is the degrees North and ranges between [-90, * 90], while longitude refers to degrees East, and ranges between (-180, 180]. - *

      + *

      * Instances of LatLon are immutable. * * @author Tom Gaskins @@ -1782,16 +1804,16 @@ public static Angle ellipsoidalForwardAzimuth(LatLon p1, LatLon p2, double equat /** * Computes the distance between two points on an ellipsoid iteratively. - *

      + *

      * NOTE: This method was copied from the UniData NetCDF Java library. http://www.unidata.ucar.edu/software/netcdf-java/ - *

      + *

      * Algorithm from U.S. National Geodetic Survey, FORTRAN program "inverse," subroutine "INVER1," by L. PFEIFER and * JOHN G. GERGEN. See http://www.ngs.noaa.gov/TOOLS/Inv_Fwd/Inv_Fwd.html - *

      + *

      * Original documentation: SOLUTION OF THE GEODETIC INVERSE PROBLEM AFTER T.VINCENTY MODIFIED RAINSFORD'S METHOD * WITH HELMERT'S ELLIPTICAL TERMS EFFECTIVE IN ANY AZIMUTH AND AT ANY DISTANCE SHORT OF ANTIPODAL * STANDPOINT/FOREPOINT MUST NOT BE THE GEOGRAPHIC POLE - *

      + *

      * Requires close to 1.4 E-5 seconds wall clock time per call on a 550 MHz Pentium with Linux 7.2. *

      * The algorithm used is iterative and will iterate only 10 times if it does not converge. diff --git a/src/gov/nasa/worldwind/geom/Line.java b/src/gov/nasa/worldwind/geom/Line.java index cbcff68eb6..6422c94d83 100644 --- a/src/gov/nasa/worldwind/geom/Line.java +++ b/src/gov/nasa/worldwind/geom/Line.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/Matrix.java b/src/gov/nasa/worldwind/geom/Matrix.java index 3d373ad864..998b0f546e 100644 --- a/src/gov/nasa/worldwind/geom/Matrix.java +++ b/src/gov/nasa/worldwind/geom/Matrix.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -1607,12 +1629,12 @@ public static Matrix fromViewportToGeographic(Sector sector, int x, int y, int w /** * Computes a symmetric covariance Matrix from the x, y, z coordinates of the specified points Iterable. This * returns null if the points Iterable is empty, or if all of the points are null. - *

      + *

      * The returned covariance matrix represents the correlation between each pair of x-, y-, and z-coordinates as * they're distributed about the point Iterable's arithmetic mean. Its layout is as follows: - *

      - * C(x, x) C(x, y) C(x, z)
      C(x, y) C(y, y) C(y, z)
      C(x, z) C(y, z) C(z, z)
      - *

      + *

      + * C(x, x) C(x, y) C(x, z)
      C(x, y) C(y, y) C(y, z)
      C(x, z) C(y, z) C(z, z)
      + *

      * C(i, j) is the covariance of coordinates i and j, where i or j are a coordinate's dispersion about its mean * value. If any entry is zero, then there's no correlation between the two coordinates defining that entry. If the * returned matrix is diagonal, then all three coordinates are uncorrelated, and the specified point Iterable is @@ -1672,17 +1694,17 @@ public static Matrix fromCovarianceOfVertices(Iterable points) /** * Computes a symmetric covariance Matrix from the x, y, z coordinates of the specified buffer of points. This * returns null if the buffer is empty. - *

      + *

      * The returned covariance matrix represents the correlation between each pair of x-, y-, and z-coordinates as * they're distributed about the points arithmetic mean. Its layout is as follows: - *

      - * C(x, x) C(x, y) C(x, z)
      C(x, y) C(y, y) C(y, z)
      C(x, z) C(y, z) C(z, z)
      - *

      + *

      + * C(x, x) C(x, y) C(x, z)
      C(x, y) C(y, y) C(y, z)
      C(x, z) C(y, z) C(z, z)
      + *

      * C(i, j) is the covariance of coordinates i and j, where i or j are a coordinate's dispersion about its mean * value. If any entry is zero, then there's no correlation between the two coordinates defining that entry. If the * returned matrix is diagonal, then all three coordinates are uncorrelated, and the specified points are * distributed evenly about their mean point. - *

      + *

      * The buffer must contain XYZ coordinate tuples which are either tightly packed or offset by the specified stride. * The stride specifies the number of buffer elements between the first coordinate of consecutive tuples. For * example, a stride of 3 specifies that each tuple is tightly packed as XYZXYZXYZ, whereas a stride of 5 specifies @@ -2422,10 +2444,10 @@ public final Vec4 getTranslation() /** * Extracts this viewing matrix's eye point. - *

      + *

      * This method assumes that this matrix represents a viewing matrix. If this does not represent a viewing matrix the * results are undefined. - *

      + *

      * In model coordinates, a viewing matrix's eye point is the point the viewer is looking from and maps to the center * of the screen. * @@ -2445,10 +2467,10 @@ public Vec4 extractEyePoint() /** * Extracts this viewing matrix's forward vector. - *

      + *

      * This method assumes that this matrix represents a viewing matrix. If this does not represent a viewing matrix the * results are undefined. - *

      + *

      * In model coordinates, a viewing matrix's forward vector is the direction the viewer is looking and maps to a * vector going into the screen. * @@ -2463,10 +2485,10 @@ public Vec4 extractForwardVector() /** * Extracts this viewing matrix's parameters given a viewing origin and a globe. - *

      + *

      * This method assumes that this matrix represents a viewing matrix. If this does not represent a viewing matrix the * results are undefined. - *

      + *

      * This returns a parameterization of this viewing matrix based on the specified origin and globe. The origin * indicates the model coordinate point that the view's orientation is relative to, while the globe provides the * necessary model coordinate context for the origin and the orientation. The origin should be either the view's eye diff --git a/src/gov/nasa/worldwind/geom/MeasurableArea.java b/src/gov/nasa/worldwind/geom/MeasurableArea.java index e661e0fa46..4fe4ed0053 100644 --- a/src/gov/nasa/worldwind/geom/MeasurableArea.java +++ b/src/gov/nasa/worldwind/geom/MeasurableArea.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/MeasurableLength.java b/src/gov/nasa/worldwind/geom/MeasurableLength.java index d7f3321c62..750537f978 100644 --- a/src/gov/nasa/worldwind/geom/MeasurableLength.java +++ b/src/gov/nasa/worldwind/geom/MeasurableLength.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/PickPointFrustum.java b/src/gov/nasa/worldwind/geom/PickPointFrustum.java index 67984ead8a..7807d42443 100644 --- a/src/gov/nasa/worldwind/geom/PickPointFrustum.java +++ b/src/gov/nasa/worldwind/geom/PickPointFrustum.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/Plane.java b/src/gov/nasa/worldwind/geom/Plane.java index d022ab151b..b16703c86d 100644 --- a/src/gov/nasa/worldwind/geom/Plane.java +++ b/src/gov/nasa/worldwind/geom/Plane.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -69,7 +91,7 @@ public Plane(double nx, double ny, double nz, double d) /** * Returns the plane that passes through the specified three points. The plane's normal is the cross product of the - * two vectors from pb to pa and pc to pa, respectively. The + * two vectors from pb to pa and pc to pa, respectively. The * returned plane is undefined if any of the specified points are colinear. * * @param pa the first point. diff --git a/src/gov/nasa/worldwind/geom/PolarPoint.java b/src/gov/nasa/worldwind/geom/PolarPoint.java index e3b1b5690d..4c71445f11 100644 --- a/src/gov/nasa/worldwind/geom/PolarPoint.java +++ b/src/gov/nasa/worldwind/geom/PolarPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -9,7 +31,7 @@ /** * Represents a point in space defined by a latitude, longitude and distance from the origin. - *

      + *

      * Instances of PolarPoint are immutable. * * @author Tom Gaskins diff --git a/src/gov/nasa/worldwind/geom/Position.java b/src/gov/nasa/worldwind/geom/Position.java index 8b53b08813..44373f1b73 100644 --- a/src/gov/nasa/worldwind/geom/Position.java +++ b/src/gov/nasa/worldwind/geom/Position.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -14,46 +36,44 @@ * @author tag * @version $Id: Position.java 2291 2014-08-30 21:38:47Z tgaskins $ */ -public class Position extends LatLon -{ +public class Position extends LatLon { + public static final Position ZERO = new Position(Angle.ZERO, Angle.ZERO, 0d); public final double elevation; - public static Position fromRadians(double latitude, double longitude, double elevation) - { + public static Position fromRadians(double latitude, double longitude, double elevation) { return new Position(Angle.fromRadians(latitude), Angle.fromRadians(longitude), elevation); } - public static Position fromDegrees(double latitude, double longitude, double elevation) - { + public static Position fromDegrees(double latitude, double longitude, double elevation) { return new Position(Angle.fromDegrees(latitude), Angle.fromDegrees(longitude), elevation); } - public static Position fromDegrees(double latitude, double longitude) - { + public static Position fromDegrees(double latitude, double longitude) { return new Position(Angle.fromDegrees(latitude), Angle.fromDegrees(longitude), 0); } - public Position(Angle latitude, Angle longitude, double elevation) - { + public Position(Angle latitude, Angle longitude, double elevation) { super(latitude, longitude); this.elevation = elevation; } - public Position(LatLon latLon, double elevation) - { + public Position(LatLon latLon, double elevation) { super(latLon); this.elevation = elevation; } + public Position(Position that) { + this(that.latitude, that.longitude, that.elevation); + } + // A class that makes it easier to pass around position lists. - public static class PositionList - { + public static class PositionList { + public List list; - public PositionList(List list) - { + public PositionList(List list) { this.list = list; } } @@ -63,8 +83,7 @@ public PositionList(List list) * * @return this position's elevation */ - public double getElevation() - { + public double getElevation() { return this.elevation; } @@ -73,21 +92,18 @@ public double getElevation() * * @return this position's elevation */ - public double getAltitude() - { + public double getAltitude() { return this.elevation; } - public Position add(Position that) - { + public Position add(Position that) { Angle lat = Angle.normalizedLatitude(this.latitude.add(that.latitude)); Angle lon = Angle.normalizedLongitude(this.longitude.add(that.longitude)); return new Position(lat, lon, this.elevation + that.elevation); } - public Position subtract(Position that) - { + public Position subtract(Position that) { Angle lat = Angle.normalizedLatitude(this.latitude.subtract(that.latitude)); Angle lon = Angle.normalizedLongitude(this.longitude.subtract(that.longitude)); @@ -106,19 +122,18 @@ public Position subtract(Position that) * * @throws IllegalArgumentException if either position is null. */ - public static Position interpolate(double amount, Position value1, Position value2) - { - if (value1 == null || value2 == null) - { + public static Position interpolate(double amount, Position value1, Position value2) { + if (value1 == null || value2 == null) { String message = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); } - if (amount < 0) + if (amount < 0) { return value1; - else if (amount > 1) + } else if (amount > 1) { return value2; + } LatLon latLon = LatLon.interpolate(amount, value1, value2); // Elevation is independent of geographic interpolation method (i.e. rhumb, great-circle, linear), so we @@ -142,14 +157,12 @@ else if (amount > 1) * @param value2 the second position. * * @return an interpolated position along the great-arc between value1 and value2, with a - * linearly interpolated elevation component. + * linearly interpolated elevation component. * * @throws IllegalArgumentException if either location is null. */ - public static Position interpolateGreatCircle(double amount, Position value1, Position value2) - { - if (value1 == null || value2 == null) - { + public static Position interpolateGreatCircle(double amount, Position value1, Position value2) { + if (value1 == null || value2 == null) { String message = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); @@ -177,14 +190,12 @@ public static Position interpolateGreatCircle(double amount, Position value1, Po * @param value2 the second position. * * @return an interpolated position along the great-arc between value1 and value2, with a - * linearly interpolated elevation component. + * linearly interpolated elevation component. * * @throws IllegalArgumentException if either location is null. */ - public static Position interpolateRhumb(double amount, Position value1, Position value2) - { - if (value1 == null || value2 == null) - { + public static Position interpolateRhumb(double amount, Position value1, Position value2) { + if (value1 == null || value2 == null) { String message = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); @@ -198,27 +209,23 @@ public static Position interpolateRhumb(double amount, Position value1, Position return new Position(latLon, elevation); } - public static boolean positionsCrossDateLine(Iterable positions) - { - if (positions == null) - { + public static boolean positionsCrossDateLine(Iterable positions) { + if (positions == null) { String msg = Logging.getMessage("nullValue.PositionsListIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } Position pos = null; - for (Position posNext : positions) - { - if (pos != null) - { + for (Position posNext : positions) { + if (pos != null) { // A segment cross the line if end pos have different longitude signs // and are more than 180 degress longitude apart - if (Math.signum(pos.getLongitude().degrees) != Math.signum(posNext.getLongitude().degrees)) - { + if (Math.signum(pos.getLongitude().degrees) != Math.signum(posNext.getLongitude().degrees)) { double delta = Math.abs(pos.getLongitude().degrees - posNext.getLongitude().degrees); - if (delta > 180 && delta < 360) + if (delta > 180 && delta < 360) { return true; + } } } pos = posNext; @@ -232,25 +239,22 @@ public static boolean positionsCrossDateLine(Iterable positi * * @param oldPosition the original reference position. * @param newPosition the new reference position. - * @param positions the positions to translate. + * @param positions the positions to translate. * * @return the translated positions, or null if the positions could not be translated. * * @throws IllegalArgumentException if any argument is null. */ public static List computeShiftedPositions(Position oldPosition, Position newPosition, - Iterable positions) - { + Iterable positions) { // TODO: Account for dateline spanning - if (oldPosition == null || newPosition == null) - { + if (oldPosition == null || newPosition == null) { String msg = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (positions == null) - { + if (positions == null) { String msg = Logging.getMessage("nullValue.PositionsListIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -260,8 +264,7 @@ public static List computeShiftedPositions(Position oldPosition, Posit double elevDelta = newPosition.getElevation() - oldPosition.getElevation(); - for (Position pos : positions) - { + for (Position pos : positions) { Angle distance = LatLon.greatCircleDistance(oldPosition, pos); Angle azimuth = LatLon.greatCircleAzimuth(oldPosition, pos); LatLon newLocation = LatLon.greatCircleEndPosition(newPosition, azimuth, distance); @@ -274,24 +277,20 @@ public static List computeShiftedPositions(Position oldPosition, Posit } public static List computeShiftedPositions(Globe globe, Position oldPosition, Position newPosition, - Iterable positions) - { - if (globe == null) - { + Iterable positions) { + if (globe == null) { String msg = Logging.getMessage("nullValue.GlobeIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (oldPosition == null || newPosition == null) - { + if (oldPosition == null || newPosition == null) { String msg = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (positions == null) - { + if (positions == null) { String msg = Logging.getMessage("nullValue.PositionsListIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -304,8 +303,7 @@ public static List computeShiftedPositions(Globe globe, Position oldPo Vec4 newPoint = globe.computePointFromPosition(newPosition); Vec4 delta = newPoint.subtract3(oldPoint); - for (Position pos : positions) - { + for (Position pos : positions) { Vec4 point = globe.computePointFromPosition(pos); point = point.add3(delta); Position newPos = globe.computePositionFromPoint(point); @@ -318,27 +316,29 @@ public static List computeShiftedPositions(Globe globe, Position oldPo } @Override - public boolean equals(Object o) - { - if (this == o) + public boolean equals(Object o) { + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } Position position = (Position) o; //noinspection RedundantIfStatement - if (Double.compare(position.elevation, elevation) != 0) + if (Double.compare(position.elevation, elevation) != 0) { return false; + } return true; } @Override - public int hashCode() - { + public int hashCode() { int result = super.hashCode(); long temp; temp = elevation != +0.0d ? Double.doubleToLongBits(elevation) : 0L; @@ -346,8 +346,7 @@ public int hashCode() return result; } - public String toString() - { + public String toString() { return "(" + this.latitude.toString() + ", " + this.longitude.toString() + ", " + this.elevation + ")"; } } diff --git a/src/gov/nasa/worldwind/geom/Quaternion.java b/src/gov/nasa/worldwind/geom/Quaternion.java index 46b4ebba4e..ecd1362544 100644 --- a/src/gov/nasa/worldwind/geom/Quaternion.java +++ b/src/gov/nasa/worldwind/geom/Quaternion.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; diff --git a/src/gov/nasa/worldwind/geom/Sector.java b/src/gov/nasa/worldwind/geom/Sector.java index 1ea51ccc72..6a5d1fd584 100644 --- a/src/gov/nasa/worldwind/geom/Sector.java +++ b/src/gov/nasa/worldwind/geom/Sector.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -22,7 +44,7 @@ * 90 degrees latitude and +/- 180 degrees longitude. The minimums and maximums are relative to these ranges, e.g., -80 * is less than 20. Behavior of the class is undefined for angles outside these ranges. Normalization is not performed * on the angles by this class, nor is it verified by the class' methods. See {@link Angle} for a description of - * specifying angles.

      Sector instances are immutable.

      + * specifying angles.

      Sector instances are immutable.

      * * @author Tom Gaskins * @version $Id: Sector.java 2397 2014-10-28 17:13:04Z dcollins $ @@ -1048,7 +1070,7 @@ public final boolean contains(Angle latitude, Angle longitude) * normalized to +/- 90 degrees latitude and +/- 180 degrees longitude. The result of the operation is undefined if * they are not. * - * @param latLon the position to test, with angles normalized to +/- π latitude and +/- 2π longitude. + * @param latLon the position to test, with angles normalized to +/- π latitude and +/- 2π longitude. * * @return true if the position is within the sector, false otherwise. * @@ -1071,8 +1093,8 @@ public final boolean contains(LatLon latLon) * are assumed to be normalized to +/- 90 degrees latitude and +/- 180 degrees longitude. The result of the * operation is undefined if they are not. * - * @param radiansLatitude the latitude in radians of the position to test, normalized +/- π. - * @param radiansLongitude the longitude in radians of the position to test, normalized +/- 2π. + * @param radiansLatitude the latitude in radians of the position to test, normalized +/- π. + * @param radiansLongitude the longitude in radians of the position to test, normalized +/- 2π. * * @return true if the position is within the sector, false otherwise. */ diff --git a/src/gov/nasa/worldwind/geom/Sphere.java b/src/gov/nasa/worldwind/geom/Sphere.java index cd14418537..58412317df 100644 --- a/src/gov/nasa/worldwind/geom/Sphere.java +++ b/src/gov/nasa/worldwind/geom/Sphere.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -9,11 +31,11 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.GL2; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.glu.*; /** - * Represents a sphere in three dimensional space.

      Instances of Sphere are immutable.

      + * Represents a sphere in three dimensional space.

      Instances of Sphere are immutable.

      * * @author Tom Gaskins * @version $Id: Sphere.java 1171 2013-02-11 21:45:02Z dcollins $ diff --git a/src/gov/nasa/worldwind/geom/Triangle.java b/src/gov/nasa/worldwind/geom/Triangle.java index 8e12a3e2c4..e43cc850f1 100644 --- a/src/gov/nasa/worldwind/geom/Triangle.java +++ b/src/gov/nasa/worldwind/geom/Triangle.java @@ -1,13 +1,35 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL; import java.nio.*; import java.util.*; diff --git a/src/gov/nasa/worldwind/geom/Vec4.java b/src/gov/nasa/worldwind/geom/Vec4.java index a3ee91eea3..3d674b8d7d 100644 --- a/src/gov/nasa/worldwind/geom/Vec4.java +++ b/src/gov/nasa/worldwind/geom/Vec4.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom; @@ -95,10 +117,10 @@ public final int hashCode() /** * Constructs a new Vec4 with coordinate values read from the specified double array. The specified offset must be 0 * or greater, the specified length must be 1 or greater, and the array must have capacity equal to or greater than - * offset + length. Coordinates are assigned as follows:

      x = array[offset]
      y - * = array[offset + 1] if length > 1, otherwise y=0
      z = array[offset + - * 2] if length > 2, otherwise z=0
      w = array[offset + 3] if - * length > 3, otherwise w=1

      + * offset + length. Coordinates are assigned as follows:

      x = array[offset]
      y + * = array[offset + 1] if length > 1, otherwise y=0
      z = array[offset + + * 2] if length > 2, otherwise z=0
      w = array[offset + 3] if + * length > 3, otherwise w=1

      * * @param array the double array from which to read coordinate data. * @param offset the array starting index. @@ -154,10 +176,10 @@ public static Vec4 fromDoubleArray(double[] array, int offset, int length) /** * Constructs a new Vec4 with coordinate values read from the specified float array. The specified offset must be 0 * or greater, the specified length must be 1 or greater, and the array must have capacity equal to or greater than - * offset + length. Coordinates are assigned as follows:

      x = array[offset]
      y - * = array[offset + 1] if length > 1, otherwise y=0
      z = array[offset + - * 2] if length > 2, otherwise z=0
      w = array[offset + 3] if - * length > 3, otherwise w=1

      + * offset + length. Coordinates are assigned as follows:

      x = array[offset]
      y + * = array[offset + 1] if length > 1, otherwise y=0
      z = array[offset + + * 2] if length > 2, otherwise z=0
      w = array[offset + 3] if + * length > 3, otherwise w=1

      * * @param array the float array from which to read coordinate data. * @param offset the array starting index. @@ -210,7 +232,7 @@ public static Vec4 fromFloatArray(float[] array, int offset, int length) /** * Constructs a new Vec4 with x and y values from the specified double array. The * specified offset must be 0 or greater, and the array must have capacity equal to or greater than offset + - * 2. Coordinates are assigned as follows:

      x = array[offset]
      y = array[offset + + * 2. Coordinates are assigned as follows:

      x = array[offset]
      y = array[offset + * 1]

      * * @param array the double array from which to read coordinate data. @@ -236,8 +258,8 @@ public static Vec4 fromArray2(double[] array, int offset) /** * Constructs a new Vec4 with x, y and z values from the specified double * array. The specified offset must be 0 or greater, and the array must have capacity equal to or greater than - * offset + 3. Coordinates are assigned as follows:

      x = array[offset]
      y = - * array[offset + 1]
      z = array[offset + 2]

      + * offset + 3. Coordinates are assigned as follows:

      x = array[offset]
      y = + * array[offset + 1]
      z = array[offset + 2]

      * * @param array the double array from which to read coordinate data. * @param offset the array starting index. @@ -264,7 +286,7 @@ public static Vec4 fromArray3(double[] array, int offset) * Constructs a new Vec4 with x, y, z and w values from the * specified double array. The specified offset must be 0 or greater, and the array must have capacity equal to or * greater than offset + 4. Coordinates are assigned as follows:

      x = - * array[offset]
      y = array[offset + 1]
      z = array[offset + 2]
      w = + * array[offset]
      y = array[offset + 1]
      z = array[offset + 2]
      w = * array[offset + 3]

      * * @param array the double array from which to read coordinate data. @@ -292,9 +314,9 @@ public static Vec4 fromArray4(double[] array, int offset) * Writes this Vec4's coordinate values to the specified double array. The specified offset must be 0 or greater, * the specified length must be 1 or greater, and the array must have capacity equal to or greater than offset * + length. Coordinates are written to the array as follows:

      array[offset] = - * x
      array[offset + 1] = y if length > 1, otherwise array[offset + - * 1] is not written to
      array[offset + 2] = z if length > 2, otherwise - * array[offset + 2] is not written to
      array[offset + 3] = w if length > + * x
      array[offset + 1] = y if length > 1, otherwise array[offset + + * 1] is not written to
      array[offset + 2] = z if length > 2, otherwise + * array[offset + 2] is not written to
      array[offset + 3] = w if length > * 3, otherwise array[offset + 3] is not written to

      * * @param array the double array to receive the coordinate data. @@ -352,9 +374,9 @@ public final double[] toDoubleArray(double[] array, int offset, int length) * Writes this Vec4's coordinate values to the specified float array. The specified offset must be 0 or greater, the * specified length must be 1 or greater, and the array must have capacity equal to or greater than offset + * length. Coordinates are written to the array as follows:

      array[offset] = - * x
      array[offset + 1] = y if length > 1, otherwise array[offset + - * 1] is not written to
      array[offset + 2] = z if length > 2, otherwise - * array[offset + 2] is not written to
      array[offset + 3] = w if length > + * x
      array[offset + 1] = y if length > 1, otherwise array[offset + + * 1] is not written to
      array[offset + 2] = z if length > 2, otherwise + * array[offset + 2] is not written to
      array[offset + 3] = w if length > * 3, otherwise array[offset + 3] is not written to

      * * @param array the float array to receive the coordinate data. @@ -410,7 +432,7 @@ public final float[] toFloatArray(float[] array, int offset, int length) /** * Writes this Vec4's x and y values to the specified double array. The specified offset * must be 0 or greater, and the array must have have capacity equal to or greater than offset + 2. - * Coordinates are written to the array as follows:

      array[offset] = x
      array[offset + 1] = + * Coordinates are written to the array as follows:

      array[offset] = x
      array[offset + 1] = * y

      * * @param array the double array to receive the coordinate data. @@ -437,7 +459,7 @@ public final double[] toArray2(double[] array, int offset) * Writes this Vec4's x, y and z values to the specified double array. The * specified offset must be 0 or greater, and the array must have have capacity equal to or greater than * offset + 3. Coordinates are written to the array as follows:

      array[offset] = - * x
      array[offset + 1] = y
      array[offset + 2] = z

      + * x

      array[offset + 1] = y
      array[offset + 2] = z

      * * @param array the double array to receive the coordinate data. * @param offset the array starting index. @@ -463,7 +485,7 @@ public final double[] toArray3(double[] array, int offset) * Writes this Vec4's x, y, z and w values to the specified * double array. The specified offset must be 0 or greater, and the array must have have capacity equal to or * greater than offset + 4. Coordinates are written to the array as follows:

      array[offset] = - * x
      array[offset + 1] = y
      array[offset + 2] = z
      array[offset + + * x
      array[offset + 1] = y
      array[offset + 2] = z
      array[offset + * 3] = w

      * * @param array the double array to receive the coordinate data. @@ -490,7 +512,7 @@ public final double[] toArray4(double[] array, int offset) * Returns a representation of this vector as an x y z point suitable for use where four-dimensional * homogeneous coordinates are required. The returned vector has x y z coordinates are equal to this * vector's x y z coordinates, and has w coordinate equal to 1.0. - *

      + *

      * A three-dimensional point in homogeneous coordinates is necessary when transforming that point by a 4x4 * transformation matrix, or when calculating the dot product of the point and the equation of a plane. The returned * vector is affected by the translation component of a 4x4 transformation matrix. @@ -512,7 +534,7 @@ public Vec4 toHomogeneousPoint3() * Returns a representation of this vector as an x y z direction suitable for use where * four-dimensional homogeneous coordinates are required. The returned vector has x y z coordinates are * equal to this vector's x y z coordinates, and has w coordinate equal to 0.0. - *

      + *

      * A three-dimensional direction in homogeneous coordinates is necessary when transforming that direction by a 4x4 * transformation matrix. The returned vector is not affected by the translation component of a 4x4 transformation * matrix, and therefore remains invariant under translation. @@ -1153,7 +1175,7 @@ public static Vec4 computeAveragePoint(Iterable points) /** * Returns the arithmetic mean of the x, y, z coordinates of the specified points buffer. This returns null if the * buffer is empty. - *

      + *

      * The buffer must contain XYZ coordinate tuples which are either tightly packed or offset by the specified stride. * The stride specifies the number of buffer elements between the first coordinate of consecutive tuples. For * example, a stride of 3 specifies that each tuple is tightly packed as XYZXYZXYZ, whereas a stride of 5 specifies diff --git a/src/gov/nasa/worldwind/geom/coords/DatumTransformation.java b/src/gov/nasa/worldwind/geom/coords/DatumTransformation.java index 4675d1a8a5..1a412d0dc2 100644 --- a/src/gov/nasa/worldwind/geom/coords/DatumTransformation.java +++ b/src/gov/nasa/worldwind/geom/coords/DatumTransformation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; diff --git a/src/gov/nasa/worldwind/geom/coords/MGRSCoord.java b/src/gov/nasa/worldwind/geom/coords/MGRSCoord.java index 31f6f3a219..7d64428dbd 100644 --- a/src/gov/nasa/worldwind/geom/coords/MGRSCoord.java +++ b/src/gov/nasa/worldwind/geom/coords/MGRSCoord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; @@ -109,10 +131,10 @@ public static MGRSCoord fromLatLon(Angle latitude, Angle longitude, Globe globe, *

      * The string will be converted to uppercase and stripped of all spaces before being evaluated. *

      - *

      Valid examples:
      - * 32TLP5626635418
      - * 32 T LP 56266 35418
      - * 11S KU 528 111
      + *

      Valid examples:
      + * 32TLP5626635418
      + * 32 T LP 56266 35418
      + * 11S KU 528 111
      *

      * @param MGRSString the MGRS coordinate text string. * @param globe the Globe - can be null (will use WGS84). diff --git a/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java b/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java index b7a946a8c6..97d577f01b 100644 --- a/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java +++ b/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; @@ -861,7 +883,7 @@ private long convertUTMToMGRS(long Zone, double Latitude, double Easting, double * The function Get_Grid_Values sets the letter range used for the 2nd letter in the MGRS coordinate string, based * on the set number of the utm zone. It also sets the false northing using a value of A for the second letter of * the grid square, based on the grid pattern and set number of the utm zone. - *

      + *

      * Key values that are set in this function include: ltr2_low_value, ltr2_high_value, and false_northing. * * @param zone Zone number diff --git a/src/gov/nasa/worldwind/geom/coords/PolarCoordConverter.java b/src/gov/nasa/worldwind/geom/coords/PolarCoordConverter.java index 3e7b14e74d..3d2190bd6f 100644 --- a/src/gov/nasa/worldwind/geom/coords/PolarCoordConverter.java +++ b/src/gov/nasa/worldwind/geom/coords/PolarCoordConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ /***************************************************************************/ diff --git a/src/gov/nasa/worldwind/geom/coords/TMCoord.java b/src/gov/nasa/worldwind/geom/coords/TMCoord.java index b5b0aa9c5e..cacc036aff 100644 --- a/src/gov/nasa/worldwind/geom/coords/TMCoord.java +++ b/src/gov/nasa/worldwind/geom/coords/TMCoord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; diff --git a/src/gov/nasa/worldwind/geom/coords/TMCoordConverter.java b/src/gov/nasa/worldwind/geom/coords/TMCoordConverter.java index d48d3a523c..9ae205adc3 100644 --- a/src/gov/nasa/worldwind/geom/coords/TMCoordConverter.java +++ b/src/gov/nasa/worldwind/geom/coords/TMCoordConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; diff --git a/src/gov/nasa/worldwind/geom/coords/UPSCoord.java b/src/gov/nasa/worldwind/geom/coords/UPSCoord.java index 62fc813bf0..c9f2a50ce4 100644 --- a/src/gov/nasa/worldwind/geom/coords/UPSCoord.java +++ b/src/gov/nasa/worldwind/geom/coords/UPSCoord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; diff --git a/src/gov/nasa/worldwind/geom/coords/UPSCoordConverter.java b/src/gov/nasa/worldwind/geom/coords/UPSCoordConverter.java index a3819591c6..1afb542ffb 100644 --- a/src/gov/nasa/worldwind/geom/coords/UPSCoordConverter.java +++ b/src/gov/nasa/worldwind/geom/coords/UPSCoordConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ /********************************************************************/ diff --git a/src/gov/nasa/worldwind/geom/coords/UTMCoord.java b/src/gov/nasa/worldwind/geom/coords/UTMCoord.java index 67cadb870d..f88dba0f5e 100644 --- a/src/gov/nasa/worldwind/geom/coords/UTMCoord.java +++ b/src/gov/nasa/worldwind/geom/coords/UTMCoord.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; diff --git a/src/gov/nasa/worldwind/geom/coords/UTMCoordConverter.java b/src/gov/nasa/worldwind/geom/coords/UTMCoordConverter.java index 1570d9fbe0..c5e8f4116a 100644 --- a/src/gov/nasa/worldwind/geom/coords/UTMCoordConverter.java +++ b/src/gov/nasa/worldwind/geom/coords/UTMCoordConverter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.geom.coords; diff --git a/src/gov/nasa/worldwind/globes/Earth.java b/src/gov/nasa/worldwind/globes/Earth.java index 817376174a..2c76f7b9ef 100644 --- a/src/gov/nasa/worldwind/globes/Earth.java +++ b/src/gov/nasa/worldwind/globes/Earth.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; diff --git a/src/gov/nasa/worldwind/globes/EarthFlat.java b/src/gov/nasa/worldwind/globes/EarthFlat.java index d68f2dd52a..79062e1c4b 100644 --- a/src/gov/nasa/worldwind/globes/EarthFlat.java +++ b/src/gov/nasa/worldwind/globes/EarthFlat.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; diff --git a/src/gov/nasa/worldwind/globes/ElevationModel.java b/src/gov/nasa/worldwind/globes/ElevationModel.java index 11ece0a4c4..ebc7ca62e2 100644 --- a/src/gov/nasa/worldwind/globes/ElevationModel.java +++ b/src/gov/nasa/worldwind/globes/ElevationModel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; @@ -11,16 +33,16 @@ import java.util.List; /** - *

      + *

      * Provides the elevations to a {@link Globe} or other object holding elevations. - *

      + *

      * An ElevationModel often approximates elevations at multiple levels of spatial resolution. For any given * viewing position, the model determines an appropriate target resolution. That target resolution may not be * immediately achievable, however, because the corresponding elevation data might not be locally available and must be * retrieved from a remote location. When this is the case, the Elevations object returned for a sector * holds the resolution achievable with the data currently available. That resolution may not be the same as the target * resolution. The achieved resolution is made available in the interface. - *

      + *

      * * @author Tom Gaskins * @version $Id: ElevationModel.java 3420 2015-09-10 23:25:43Z tgaskins $ @@ -84,7 +106,7 @@ public interface ElevationModel extends WWObject, Restorable, Disposable /** * Specifies the value used to identify missing data in an elevation model. Locations with this elevation value are * assigned the missing-data replacement value, specified by {@link #setMissingDataReplacement(double)}. - *

      + *

      * The missing-data value is often specified by the metadata of the data set, in which case the elevation model * automatically defines that value to be the missing-data signal. When the missing-data signal is not specified in * the metadata, the application may specify it via this method. @@ -194,7 +216,7 @@ public interface ElevationModel extends WWObject, Restorable, Disposable * Returns the elevation at a specified location. If the elevation at the specified location is the elevation * model's missing data signal, or if the location specified is outside the elevation model's coverage area, the * elevation model's missing data replacement value is returned. - *

      + *

      * The elevation returned from this method is the best available in memory. If no elevation is in memory, the * elevation model's minimum extreme elevation at the location is returned. Local disk caches are not consulted. * diff --git a/src/gov/nasa/worldwind/globes/EllipsoidalGlobe.java b/src/gov/nasa/worldwind/globes/EllipsoidalGlobe.java index a908df5e35..479cf7fbe6 100644 --- a/src/gov/nasa/worldwind/globes/EllipsoidalGlobe.java +++ b/src/gov/nasa/worldwind/globes/EllipsoidalGlobe.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; @@ -902,12 +924,12 @@ protected Vec4 geodeticToEllipsoidal(Angle latitude, Angle longitude, double met * points to the intersection of the prime meridian and the equator, in the equatorial plane. The X axis completes a * right-handed coordinate system, and is 90 degrees east of the Z axis and also in the equatorial plane. Sea level * is at z = zero. - *

      + *

      * This method provides an interface for efficient generation of a grid of cartesian points within a sector. The * grid is constructed by dividing the sector into numLon x numLat evenly separated points in * geographic coordinates. The first and last points in latitude and longitude are placed at the sector's minimum * and maximum boundary, and the remaining points are spaced evenly between those boundary points. - *

      + *

      * For each grid point within the sector, an elevation value is specified via an array of elevations. The * calculation at each position incorporates the associated elevation. * diff --git a/src/gov/nasa/worldwind/globes/FlatGlobe.java b/src/gov/nasa/worldwind/globes/FlatGlobe.java index 8c2f5d4e20..ef9f8c746b 100644 --- a/src/gov/nasa/worldwind/globes/FlatGlobe.java +++ b/src/gov/nasa/worldwind/globes/FlatGlobe.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; @@ -17,7 +39,7 @@ * is Mercator. New projections may be added by extending this class and overriding {@link * #geodeticToCartesian(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle, double) geodeticToCartesian} * {@link #cartesianToGeodetic(gov.nasa.worldwind.geom.Vec4) cartesianToGeodetic}. - *

      + *

      * This globe uses a Cartesian coordinate system in the world plane is located at the origin and has UNIT-Z as normal. * The Y axis points to the north pole. The Z axis points up. The X axis completes a right-handed coordinate system, and * points east. Latitude and longitude zero are at the origin on y and x respectively. Sea level is at z = zero. @@ -142,6 +164,7 @@ public GlobeStateKey getGlobeStateKey() * * @deprecated Use {@link #setProjection(GeographicProjection)}. */ + @Deprecated public void setProjection(String projection) { if (projection == null) diff --git a/src/gov/nasa/worldwind/globes/GeographicProjection.java b/src/gov/nasa/worldwind/globes/GeographicProjection.java index 33874174dc..3c3533862a 100644 --- a/src/gov/nasa/worldwind/globes/GeographicProjection.java +++ b/src/gov/nasa/worldwind/globes/GeographicProjection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; @@ -11,7 +33,7 @@ /** * Defines an interface to project geographic coordinates to Cartesian coordinates. Used by {@link Globe2D} * implementations to transform geographic coordinates to meters and back. - *

      + *

      * Each implementation of this interface defines its own constructors, which may accept arguments that completely define * the projection. * @@ -55,7 +77,7 @@ public interface GeographicProjection /** * Converts a geographic position to meters in Cartesian coordinates. - *

      + *

      * Note: The input arguments are not checked for null prior to being used. The caller, typically a * {@link Globe2D} implementation, is expected do perform that check prior to calling this method. * @@ -75,12 +97,12 @@ public interface GeographicProjection /** * Converts a grid of geographic positions to a grid of points in Cartesian coordinates. - *

      + *

      * This method provides an interface for efficient generation of a grid of cartesian points within a sector. The * grid is constructed by dividing the sector into numLon x numLat evenly separated points in * geographic coordinates. The first and last points in latitude and longitude are placed at the sector's minimum * and maximum boundary, and the remaining points are spaced evenly between those boundary points. - *

      + *

      * For each grid point within the sector, an elevation value is specified via an array of elevations. The * calculation at each position incorporates the associated elevation. * @@ -104,7 +126,7 @@ void geographicToCartesian(Globe globe, Sector sector, int numLat, int numLon, d /** * Converts a Cartesian point in meters to a geographic position. - *

      + *

      * Note: The input arguments are not checked for null prior to being used. The caller, typically a * {@link Globe2D} implementation, is expected do perform that check prior to calling this method. * diff --git a/src/gov/nasa/worldwind/globes/Globe.java b/src/gov/nasa/worldwind/globes/Globe.java index a34224c52e..b1bb238d7f 100644 --- a/src/gov/nasa/worldwind/globes/Globe.java +++ b/src/gov/nasa/worldwind/globes/Globe.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; @@ -17,27 +39,23 @@ * elevations for geographic positions on the surface of the globe. Globe provides methods for converting geographic * positions (latitude, longitude, and elevation) to cartesian coordinates, and for converting cartesian to geographic. * The origin and orientation of the cartesian coordinate system are determined by implementations of this interface. - *

      *

      Computations in Cartesian Coordinates

      - *

      + *

      * Globe provides methods for performing computations in the coordinate system represented by a globe's surface in * cartesian coordinates. These methods perform work with respect to the globe's actual shape in 3D cartesian * coordinates. For an ellipsoidal globe, these methods are equivalent to the ellipsoidal coordinate computations below. * For an instance of {@link Globe2D}, these methods work in the cartesian coordinates specified by the globe's 2D * projection. - *

      *

      • {@link #computePointFromPosition(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle, double)}
      • *
      • {@link #computePositionFromPoint(gov.nasa.worldwind.geom.Vec4)}
      • {@link * #computeSurfaceNormalAtLocation(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle)}
      • {@link * #computeSurfaceOrientationAtPosition(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle, double)}
      • *
      - *

      *

      Computations in Ellipsoidal Coordinates

      - *

      + *

      * Globe provides methods for performing computation on the ellipsoid represented by a globe's equatorial radius and its * polar radius. These methods perform work with respect to the ellipsoid in 3D cartesian coordinates. Calling any of * these methods on an instance of Globe2D will return the same result as a 3D globe with equivalent radii. - *

      *

      • {@link #computeEllipsoidalPointFromPosition(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle, * double)}
      • {@link #computePositionFromEllipsoidalPoint(gov.nasa.worldwind.geom.Vec4)}
      • {@link * #computeEllipsoidalNormalAtLocation(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle)}
      • {@link @@ -91,7 +109,7 @@ public interface Globe extends WWObject, Extent * Indicates the elevation at a specified location. If the elevation at the specified location is the elevation * model's missing data signal, or if the location specified is outside the elevation model's coverage area, the * elevation model's missing data replacement value is returned. - *

        + *

        * The elevation returned from this method is the best available in memory. If no elevation is in memory, the * elevation model's minimum extreme elevation at the location is returned. Local disk caches are not consulted. * @@ -242,12 +260,12 @@ public interface Globe extends WWObject, Extent /** * Computes a grid of cartesian points corresponding to a grid of geographic positions. - *

        + *

        * This method provides an interface for efficient generation of a grid of cartesian points within a sector. The * grid is constructed by dividing the sector into numLon x numLat evenly separated points in * geographic coordinates. The first and last points in latitude and longitude are placed at the sector's minimum * and maximum boundary, and the remaining points are spaced evenly between those boundary points. - *

        + *

        * For each grid point within the sector, an elevation value is specified via an array of elevations. The * calculation at each position incorporates the associated elevation. * @@ -296,12 +314,20 @@ public interface Globe extends WWObject, Extent */ Vec4 computeNorthPointingTangentAtLocation(Angle latitude, Angle longitude); - /** @see #computeSurfaceOrientationAtPosition(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle, double). */ - @SuppressWarnings({"JavaDoc"}) + /** + * @see #computeSurfaceOrientationAtPosition(gov.nasa.worldwind.geom.Angle, gov.nasa.worldwind.geom.Angle, double) + * @param latitude See computeSurfaceOrientationAtPosition. + * @param longitude See computeSurfaceOrientationAtPosition. + * @param metersElevation See computeSurfaceOrientationAtPosition. + * @return See computeSurfaceOrientationAtPosition. + */ Matrix computeModelCoordinateOriginTransform(Angle latitude, Angle longitude, double metersElevation); - /** @see #computeSurfaceOrientationAtPosition(gov.nasa.worldwind.geom.Position) */ - @SuppressWarnings({"JavaDoc"}) + /** + * @see #computeSurfaceOrientationAtPosition(gov.nasa.worldwind.geom.Position) + * @param position See computeSurfaceOrientationAtPosition. + * @return See computeSurfaceOrientationAtPosition. + */ Matrix computeModelCoordinateOriginTransform(Position position); /** @@ -336,7 +362,7 @@ public interface Globe extends WWObject, Extent /** * Computes a ellipsoidal point from a latitude, longitude, and elevation. - *

        + *

        * The returned point is a function of this globe's equatorial radius and its polar radius, and always represents a * point on the ellipsoid in 3D cartesian coordinates that corresponds to the specified position. Calling this * method on an instance of Globe2D will return a point on the ellipsoid defined by the 2D globe's radii. @@ -354,7 +380,7 @@ public interface Globe extends WWObject, Extent /** * Computes a ellipsoidal point from a latitude and longitude. - *

        + *

        * The returned point is a function of this globe's equatorial radius and its polar radius, and always represents a * point on the ellipsoid in 3D cartesian coordinates that corresponds to the specified location. Calling this * method on an instance of Globe2D will return a point on the ellipsoid defined by the 2D globe's radii. @@ -369,7 +395,7 @@ public interface Globe extends WWObject, Extent /** * Computes a ellipsoidal point from a latitude, longitude, and elevation. - *

        + *

        * The returned point is a function of this globe's equatorial radius and its polar radius, and always represents a * point on the ellipsoid in 3D cartesian coordinates that corresponds to the specified position. Calling this * method on an instance of Globe2D will return a point on the ellipsoid defined by the 2D globe's radii. @@ -385,7 +411,7 @@ public interface Globe extends WWObject, Extent /** * Computes the geographic position of a point in ellipsoidal coordinates. - *

        + *

        * The returned position is a function of this globe's equatorial radius and its polar radius, and always represents * a position corresponding to the point on the ellipsoid in 3D cartesian coordinates. Calling this method on an * instance of Globe2D will return a position corresponding to the ellipsoid defined by the 2D globe's radii. @@ -400,7 +426,7 @@ public interface Globe extends WWObject, Extent /** * Computes a vector perpendicular to the surface of the ellipsoid specified by this globe, in cartesian * coordinates. - *

        + *

        * The returned vector is a function of this globe's equatorial radius and its polar radius, and always represents a * vector normal to the corresponding ellipsoid in 3D cartesian coordinates. Calling this method on an instance of * Globe2D will return a vector normal to the ellipsoid defined by the 2D globe's radii. @@ -421,7 +447,7 @@ public interface Globe extends WWObject, Extent * East. The Y axis is mapped to the vector tangent to the ellipsoid and pointing to the North Pole. The Z axis is * mapped to the ellipsoidal normal at (latitude, longitude, metersElevation). The origin is mapped to the * ellipsoidal position of (latitude, longitude, metersElevation). - *

        + *

        * The returned matrix is a function of this globe's equatorial radius and its polar radius, and always represents a * transform matrix appropriate for the corresponding ellipsoid in 3D cartesian coordinates. Calling this method on * an instance of Globe2D will return a transform matrix for the ellipsoid defined by the 2D globe's radii. diff --git a/src/gov/nasa/worldwind/globes/Globe2D.java b/src/gov/nasa/worldwind/globes/Globe2D.java index 3644ca2f9a..a484c7f840 100644 --- a/src/gov/nasa/worldwind/globes/Globe2D.java +++ b/src/gov/nasa/worldwind/globes/Globe2D.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; diff --git a/src/gov/nasa/worldwind/globes/GlobeStateKey.java b/src/gov/nasa/worldwind/globes/GlobeStateKey.java index ddcf70d5d6..026953813c 100644 --- a/src/gov/nasa/worldwind/globes/GlobeStateKey.java +++ b/src/gov/nasa/worldwind/globes/GlobeStateKey.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes; diff --git a/src/gov/nasa/worldwind/globes/package-info.java b/src/gov/nasa/worldwind/globes/package-info.java new file mode 100644 index 0000000000..a59fdd775e --- /dev/null +++ b/src/gov/nasa/worldwind/globes/package-info.java @@ -0,0 +1,39 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for representing the shape and terrain of a planet. A {@link gov.nasa.worldwind.globes.Globe} is + * part of a {@link gov.nasa.worldwind.Model}, and provides methods for converting between geographic and Cartesian + * coordinates. {@link gov.nasa.worldwind.globes.EllipsoidalGlobe} captures features of globes modelled with an + * ellipsoid, and {@link gov.nasa.worldwind.globes.Earth} is an ellipsoidal model of the Earth using the World Geodetic System (WGS84). + * {@link gov.nasa.worldwind.globes.FlatGlobe} represents a globe projected onto a plane.

        + * + */ +package gov.nasa.worldwind.globes; diff --git a/src/gov/nasa/worldwind/globes/package.html b/src/gov/nasa/worldwind/globes/package.html deleted file mode 100644 index fa993e45a0..0000000000 --- a/src/gov/nasa/worldwind/globes/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - Globes - - - -

        Provides classes for representing the shape and terrain of a planet. A {@link gov.nasa.worldwind.globes.Globe} is - part of a {@link gov.nasa.worldwind.Model}, and provides methods for converting between geographic and Cartesian - coordinates. {@link gov.nasa.worldwind.globes.EllipsoidalGlobe} captures features of globes modelled with an - ellipsoid, and {@link gov.nasa.worldwind.globes.Earth} is an ellipsoidal model of the Earth using the World Geodetic System (WGS84). - {@link gov.nasa.worldwind.globes.FlatGlobe} represents a globe projected onto a plane.

        - - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/globes/projections/AbstractGeographicProjection.java b/src/gov/nasa/worldwind/globes/projections/AbstractGeographicProjection.java index 8be038f428..b66f32aca0 100644 --- a/src/gov/nasa/worldwind/globes/projections/AbstractGeographicProjection.java +++ b/src/gov/nasa/worldwind/globes/projections/AbstractGeographicProjection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionEquirectangular.java b/src/gov/nasa/worldwind/globes/projections/ProjectionEquirectangular.java index 8112bd097d..cc1b837545 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionEquirectangular.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionEquirectangular.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionMercator.java b/src/gov/nasa/worldwind/globes/projections/ProjectionMercator.java index 3efe381db8..f9383aa829 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionMercator.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionMercator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionModifiedSinusoidal.java b/src/gov/nasa/worldwind/globes/projections/ProjectionModifiedSinusoidal.java index 9c6367a239..7dfb4a3adf 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionModifiedSinusoidal.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionModifiedSinusoidal.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionPolarEquidistant.java b/src/gov/nasa/worldwind/globes/projections/ProjectionPolarEquidistant.java index 7bcd79d9b7..c23af17668 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionPolarEquidistant.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionPolarEquidistant.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionSinusoidal.java b/src/gov/nasa/worldwind/globes/projections/ProjectionSinusoidal.java index 93608a58a9..2a255e8a33 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionSinusoidal.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionSinusoidal.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionTransverseMercator.java b/src/gov/nasa/worldwind/globes/projections/ProjectionTransverseMercator.java index 483e4209cd..44ab4e2d07 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionTransverseMercator.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionTransverseMercator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; @@ -16,7 +38,7 @@ * may be specified and defaults to the Prime Meridian (0 longitude). By default, the projection computes values for 30 * degrees either side of the central meridian. This may be changed via the {@link * #setWidth(gov.nasa.worldwind.geom.Angle)} method, but the projection may fail for large widths. - *

        + *

        * The projection limits are modified to reflect the central meridian and the width, however the projection limits are * clamped to a minimum of -180 degrees and a maximum of +180 degrees. It's therefore not possible to display a band * whose central meridian is plus or minus 180. diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionUPS.java b/src/gov/nasa/worldwind/globes/projections/ProjectionUPS.java index c181f2cffc..1675c40053 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionUPS.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionUPS.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/globes/projections/ProjectionUTM.java b/src/gov/nasa/worldwind/globes/projections/ProjectionUTM.java index 5a5f29d507..23ff9e213a 100644 --- a/src/gov/nasa/worldwind/globes/projections/ProjectionUTM.java +++ b/src/gov/nasa/worldwind/globes/projections/ProjectionUTM.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.globes.projections; diff --git a/src/gov/nasa/worldwind/layers/AbstractGraticuleLayer.java b/src/gov/nasa/worldwind/layers/AbstractGraticuleLayer.java index 455424c0fd..6d46dd6ead 100644 --- a/src/gov/nasa/worldwind/layers/AbstractGraticuleLayer.java +++ b/src/gov/nasa/worldwind/layers/AbstractGraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -619,7 +641,7 @@ protected void selectRenderables(DrawContext dc) /** * Determines whether the grid should be updated. It returns true if:

        • the eye has moved more than 1% of its * altitude above ground
        • the view FOV, heading or pitch have changed more than 1 degree
        • vertical - * exaggeration has changed
        * * @param dc the current DrawContext. * @@ -721,9 +743,8 @@ protected Object createLineRenderable(Iterable positions, St { Path path = new Path(positions); path.setPathType(pathType); - path.setFollowTerrain(true); + path.setSurfacePath(true); path.setTerrainConformance(1); - path.setAltitudeMode(WorldWind.CLAMP_TO_GROUND); return path; } diff --git a/src/gov/nasa/worldwind/layers/AbstractLayer.java b/src/gov/nasa/worldwind/layers/AbstractLayer.java index c014c63fb4..c4f3be4867 100644 --- a/src/gov/nasa/worldwind/layers/AbstractLayer.java +++ b/src/gov/nasa/worldwind/layers/AbstractLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -385,7 +407,8 @@ public static boolean isLayerConfigDocument(Element domElement) /** * Appends layer configuration parameters as elements to the specified context. This appends elements for the - * following parameters:
        ParameterElement PathType
        {@link + * following parameters: + * *
        Append Elements
        ParameterElement PathType
        {@link * AVKey#DISPLAY_NAME}DisplayNameString
        {@link * AVKey#OPACITY}OpacityDouble
        {@link AVKey#MAX_ACTIVE_ALTITUDE}ActiveAltitudes/@maxDouble
        {@link AVKey#MIN_ACTIVE_ALTITUDE}ActiveAltitudes/@minDouble
        {@link @@ -441,7 +464,8 @@ public static Element createLayerConfigElements(AVList params, Element context) /** * Parses layer configuration parameters from the specified DOM document. This writes output as key-value pairs to * params. If a parameter from the XML document already exists in params, that parameter is ignored. Supported key - * and parameter names are:
        ParameterElement PathType
        {@link + * and parameter names are: + * *
        Supported Names
        ParameterElement PathType
        {@link * AVKey#DISPLAY_NAME}DisplayNameString
        {@link * AVKey#OPACITY}OpacityDouble
        {@link AVKey#MAX_ACTIVE_ALTITUDE}ActiveAltitudes/@maxDouble
        {@link AVKey#MIN_ACTIVE_ALTITUDE}ActiveAltitudes/@minDouble
        {@link diff --git a/src/gov/nasa/worldwind/layers/AirspaceLayer.java b/src/gov/nasa/worldwind/layers/AirspaceLayer.java index cc739b6db3..1b405638db 100644 --- a/src/gov/nasa/worldwind/layers/AirspaceLayer.java +++ b/src/gov/nasa/worldwind/layers/AirspaceLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -19,6 +41,7 @@ * @version $Id: AirspaceLayer.java 2231 2014-08-15 19:03:12Z dcollins $ * @deprecated Use {@link RenderableLayer} instead. */ +@Deprecated public class AirspaceLayer extends AbstractLayer { private final java.util.Collection airspaces = new java.util.concurrent.ConcurrentLinkedQueue(); @@ -40,6 +63,7 @@ public AirspaceLayer() * @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#addRenderable(gov.nasa.worldwind.render.Renderable)} * instead. */ + @Deprecated public void addAirspace(Airspace airspace) { if (airspace == null) @@ -69,6 +93,7 @@ public void addAirspace(Airspace airspace) * @throws IllegalStateException if a custom Iterable has been specified by a call to setRenderables. * @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#addRenderables(Iterable)} instead. */ + @Deprecated public void addAirspaces(Iterable airspaces) { if (airspaces == null) @@ -104,6 +129,7 @@ public void addAirspaces(Iterable airspaces) * @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#removeRenderable(gov.nasa.worldwind.render.Renderable)} * instead. */ + @Deprecated public void removeAirspace(Airspace airspace) { if (airspace == null) @@ -129,6 +155,7 @@ public void removeAirspace(Airspace airspace) * @throws IllegalStateException If a custom Iterable has been specified by a call to setAirspaces. * @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#removeAllRenderables()} instead. */ + @Deprecated public void removeAllAirspaces() { if (this.airspacesOverride != null) @@ -157,6 +184,7 @@ private void clearAirspaces() * * @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#getRenderables()} instead. */ + @Deprecated public Iterable getAirspaces() { if (this.airspacesOverride != null) @@ -196,7 +224,7 @@ private Iterable getActiveAirspaces() * layer will maintain a reference to airspaceIterable strictly for picking and rendering. This layer * will not modify the Iterable reference. However, this will clear the internal collection of Airspaces, and will * prevent any modification to its contents via addAirspace, addAirspaces, or removeAirspaces. - *

        + *

        * If the specified airspaceIterable is null, this layer will revert to maintaining its internal * collection. * @@ -204,6 +232,7 @@ private Iterable getActiveAirspaces() * * @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#setRenderables(Iterable)} instead. */ + @Deprecated public void setAirspaces(Iterable airspaceIterable) { this.airspacesOverride = airspaceIterable; @@ -219,6 +248,7 @@ public void setAirspaces(Iterable airspaceIterable) * @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#isEnableAntialiasing()} on each Airspace * instance in the layer. */ + @Deprecated public boolean isEnableAntialiasing() { return false; // deprecated method @@ -232,6 +262,7 @@ public boolean isEnableAntialiasing() * @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#setEnableAntialiasing(boolean)} on each Airspace * instance in the layer. */ + @Deprecated public void setEnableAntialiasing(boolean enable) { // deprecated method @@ -245,6 +276,7 @@ public void setEnableAntialiasing(boolean enable) * @deprecated Control over airspace blending is no longer supported. Airspaces implicitly blend themselves with * other objects in the scene. */ + @Deprecated public boolean isEnableBlending() { return false; // deprecated method @@ -258,6 +290,7 @@ public boolean isEnableBlending() * @deprecated Control over airspace blending is no longer supported. Airspaces implicitly blend themselves with * other objects in the scene. */ + @Deprecated public void setEnableBlending(boolean enable) { // deprecated method @@ -271,6 +304,7 @@ public void setEnableBlending(boolean enable) * @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#isEnableDepthOffset()} on each Airspace * instance in the layer. */ + @Deprecated public boolean isEnableDepthOffset() { return false; // deprecated method @@ -284,6 +318,7 @@ public boolean isEnableDepthOffset() * @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)} on each * Airspace instance in the layer. */ + @Deprecated public void setEnableDepthOffset(boolean enable) { // deprecated method @@ -297,6 +332,7 @@ public void setEnableDepthOffset(boolean enable) * @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#isEnableLighting()} on each Airspace instance in * the layer. */ + @Deprecated public boolean isEnableLighting() { return false; // deprecated method @@ -310,6 +346,7 @@ public boolean isEnableLighting() * @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#isEnableLighting()} on each Airspace instance in * the layer. */ + @Deprecated public void setEnableLighting(boolean enable) { // deprecated method @@ -322,6 +359,7 @@ public void setEnableLighting(boolean enable) * * @deprecated Control over drawing Airspace extents is no longer supported. */ + @Deprecated public boolean isDrawExtents() { return false; // deprecated method @@ -334,6 +372,7 @@ public boolean isDrawExtents() * * @deprecated Control over drawing Airspace extents is no longer supported. */ + @Deprecated public void setDrawExtents(boolean draw) { // deprecated method @@ -346,6 +385,7 @@ public void setDrawExtents(boolean draw) * * @deprecated Control over drawing Airspace in wireframe mode is no longer supported. */ + @Deprecated public boolean isDrawWireframe() { return false; // deprecated method @@ -358,6 +398,7 @@ public boolean isDrawWireframe() * * @deprecated Control over drawing Airspace in wireframe mode is no longer supported. */ + @Deprecated public void setDrawWireframe(boolean draw) { // deprecated method @@ -371,6 +412,7 @@ public void setDrawWireframe(boolean draw) * @deprecated Control over Airspace depth offset is no longer supported. See {@link * gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}. */ + @Deprecated public Double getDepthOffsetFactor() { return 0d; // deprecated method @@ -384,6 +426,7 @@ public Double getDepthOffsetFactor() * @deprecated Control over Airspace depth factor is no longer supported. See {@link * gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}. */ + @Deprecated public void setDepthOffsetFactor(Double factor) { // deprecated method @@ -397,6 +440,7 @@ public void setDepthOffsetFactor(Double factor) * @deprecated Control over Airspace depth units is no longer supported. See {@link * gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}. */ + @Deprecated public Double getDepthOffsetUnits() { return 0d; // deprecated method @@ -410,6 +454,7 @@ public Double getDepthOffsetUnits() * @deprecated Control over Airspace depth units is no longer supported. See {@link * gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}. */ + @Deprecated public void setDepthOffsetUnits(Double units) { // deprecated method @@ -423,6 +468,7 @@ public void setDepthOffsetUnits(Double units) * @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#isEnableBatchRendering()} on each Airspace * instance in the layer. */ + @Deprecated public boolean isEnableBatchRendering() { return false; // deprecated method @@ -436,6 +482,7 @@ public boolean isEnableBatchRendering() * @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#setEnableBatchRendering(boolean)} on each * Airspace instance in the layer. */ + @Deprecated public void setEnableBatchRendering(boolean enableBatchRendering) { // deprecated method @@ -449,6 +496,7 @@ public void setEnableBatchRendering(boolean enableBatchRendering) * @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#isEnableBatchPicking()} on each Airspace * instance in the layer. */ + @Deprecated public boolean isEnableBatchPicking() { return false; // deprecated method @@ -462,6 +510,7 @@ public boolean isEnableBatchPicking() * @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#setEnableBatchPicking(boolean)} on each * Airspace instance in the layer. */ + @Deprecated public void setEnableBatchPicking(boolean enableBatchPicking) { // deprecated method diff --git a/src/gov/nasa/worldwind/layers/AnnotationLayer.java b/src/gov/nasa/worldwind/layers/AnnotationLayer.java index ad93bdf643..d7c2c61af9 100644 --- a/src/gov/nasa/worldwind/layers/AnnotationLayer.java +++ b/src/gov/nasa/worldwind/layers/AnnotationLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -182,7 +204,7 @@ protected Iterable getActiveAnnotations() * layer will maintain a reference to annotationIterable strictly for picking and rendering. This layer * will not modify the Iterable reference. However, this will clear the internal collection of Annotations, and will * prevent any modification to its contents via addAnnotation, addAnnotations, or removeAnnotations. - *

        + *

        * If the specified annotationIterable is null, this layer will revert to maintaining its internal * collection. * diff --git a/src/gov/nasa/worldwind/layers/BasicLayerFactory.java b/src/gov/nasa/worldwind/layers/BasicLayerFactory.java index e31e4db05b..4cb6e8c3af 100644 --- a/src/gov/nasa/worldwind/layers/BasicLayerFactory.java +++ b/src/gov/nasa/worldwind/layers/BasicLayerFactory.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -34,11 +56,11 @@ public BasicLayerFactory() *

      • a {@link java.net.URL}
      • a {@link java.io.File}
      • a {@link java.io.InputStream}
      • {@link * Element}
      • a {@link String} holding a file name, a name of a resource on the classpath, or a string * representation of a URL
      • - *

        + *

        * For tiled image layers, this maps the serviceName attribute of the Layer/Service * element of the XML configuration file to the appropriate base tiled image layer type. Service types recognized * are:

        • "WMS" for layers that draw their data from a WMS web service.
        • "WWTileService" for layers - * that draw their data from a World Wind tile service.
        • "Offline" for layers that draw their data only from + * that draw their data from a WorldWind tile service.
        • "Offline" for layers that draw their data only from * the local cache.
        * * @param configSource the configuration source. See above for supported types. @@ -134,7 +156,7 @@ protected Object doCreateFromElement(Element domElement, AVList params) throws E /** * Create a collection of layer lists and their included layers described by an array of XML layer-list description * elements. - *

        + *

        * Any exceptions occurring during creation of the layer lists or their included layers are logged and not * re-thrown. The layers associated with the exceptions are not included in the returned layer list. * @@ -211,7 +233,7 @@ else if (o instanceof LayerList[]) /** * Create a list of layers described by an array of XML layer description elements. - *

        + *

        * Any exceptions occurring during creation of the layers are logged and not re-thrown. The layers associated with * the exceptions are not included in the returned layer list. * @@ -250,7 +272,7 @@ protected LayerList createLayerList(Element[] layerElements, AVList params) * * @throws WWUnrecognizedException if the layer type or service type given in the describing element is * unrecognized. - * @see #createTiledImageLayer(org.w3c.dom.Element, gov.nasa.worldwind.avlist.AVList). + * @see #createTiledImageLayer(org.w3c.dom.Element, gov.nasa.worldwind.avlist.AVList) */ protected Layer createFromLayerDocument(Element domElement, AVList params) { diff --git a/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java b/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java index ff31d084a1..1b73e7d839 100644 --- a/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java +++ b/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -346,7 +368,7 @@ protected boolean loadTexture(TextureTile tile, java.net.URL textureURL) * the specified format. Otherwise, this returns the texture data in its native format. If useMipMaps * is true, this generates mip maps for any non-DDS texture data, and uses any mip-maps contained in DDS texture * data. - *

        + *

        * Supported texture formats are as follows:

        • image/dds - Returns DDS texture data, converting * the data to DDS if necessary. If the data is already in DDS format it's returned as-is.
        * @@ -400,11 +422,11 @@ protected void addTileToCache(TextureTile tile) /** * Start a new {@link BulkRetrievalThread} that downloads all imagery for a given sector and resolution to the - * current World Wind file cache, without downloading imagery that is already in the cache. - *

        + * current WorldWind file cache, without downloading imagery that is already in the cache. + *

        * This method creates and starts a thread to perform the download. A reference to the thread is returned. To create * a downloader that has not been started, construct a {@link BasicTiledImageLayerBulkDownloader}. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * @@ -426,16 +448,16 @@ public BulkRetrievalThread makeLocal(Sector sector, double resolution, BulkRetri /** * Start a new {@link BulkRetrievalThread} that downloads all imagery for a given sector and resolution to a * specified {@link FileStore}, without downloading imagery that is already in the file store. - *

        + *

        * This method creates and starts a thread to perform the download. A reference to the thread is returned. To create * a downloader that has not been started, construct a {@link BasicTiledImageLayerBulkDownloader}. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * * @param sector the sector to download data for. * @param resolution the target resolution, provided in radians of latitude per texel. - * @param fileStore the file store in which to place the downloaded imagery. If null the current World Wind file + * @param fileStore the file store in which to place the downloaded imagery. If null the current WorldWind file * cache is used. * @param listener an optional retrieval listener. May be null. * @@ -460,9 +482,9 @@ public BulkRetrievalThread makeLocal(Sector sector, double resolution, FileStore } /** - * Get the estimated size in bytes of the imagery not in the World Wind file cache for the given sector and + * Get the estimated size in bytes of the imagery not in the WorldWind file cache for the given sector and * resolution. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * @@ -481,13 +503,13 @@ public long getEstimatedMissingDataSize(Sector sector, double resolution) /** * Get the estimated size in bytes of the imagery not in a specified file store for a specified sector and * resolution. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * * @param sector the sector to estimate. * @param resolution the target resolution, provided in radians of latitude per texel. - * @param fileStore the file store to examine. If null the current World Wind file cache is used. + * @param fileStore the file store to examine. If null the current WorldWind file cache is used. * * @return the estimated size in byte of the missing imagery. * @@ -716,7 +738,7 @@ protected String retrieveResources() // // Note that we use the URL's String representation as the cache key. We cannot use the URL itself, because // the cache invokes the methods Object.hashCode() and Object.equals() on the cache key. URL's implementations - // of hashCode() and equals() perform blocking IO calls. World Wind does not perform blocking calls during + // of hashCode() and equals() perform blocking IO calls. WorldWind does not perform blocking calls during // rendering, and this method is likely to be called from the rendering thread. WMSCapabilities caps; if (this.isNetworkRetrievalEnabled()) diff --git a/src/gov/nasa/worldwind/layers/BasicTiledImageLayerBulkDownloader.java b/src/gov/nasa/worldwind/layers/BasicTiledImageLayerBulkDownloader.java index 62326e15b2..fd343df397 100644 --- a/src/gov/nasa/worldwind/layers/BasicTiledImageLayerBulkDownloader.java +++ b/src/gov/nasa/worldwind/layers/BasicTiledImageLayerBulkDownloader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -20,9 +42,9 @@ import java.util.*; /** - * Downloads imagery not currently available in the World Wind file cache or a specified file store. The class derives + * Downloads imagery not currently available in the WorldWind file cache or a specified file store. The class derives * from {@link Thread} and is meant to operate in its own thread. - *

        + *

        * The sector and resolution associated with the downloader are specified during construction and are final. * * @author tag @@ -38,8 +60,8 @@ public class BasicTiledImageLayerBulkDownloader extends BulkRetrievalThread protected ArrayList missingTiles; /** - * Constructs a downloader to retrieve imagery not currently available in the World Wind file cache. - *

        + * Constructs a downloader to retrieve imagery not currently available in the WorldWind file cache. + *

        * The thread returned is not started during construction, the caller must start the thread. * * @param layer the layer for which to download imagery. @@ -61,7 +83,7 @@ public BasicTiledImageLayerBulkDownloader(BasicTiledImageLayer layer, Sector sec /** * Constructs a downloader to retrieve imagery not currently available in a specified file store. - *

        + *

        * The thread returned is not started during construction, the caller must start the thread. * * @param layer the layer for which to download imagery. diff --git a/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java b/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java index 4e8e3ae936..4da00b3b5c 100644 --- a/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java +++ b/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -12,13 +34,13 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.util.Collection; /** * Holds a collection of Renderables and manages local caching of them. Provides searching for Renderables by sector, * location or name. - *

        + *

        * NOTE: This class is experimental and not fully implemented. You should not use it now. * * @author tag diff --git a/src/gov/nasa/worldwind/layers/CompassLayer.java b/src/gov/nasa/worldwind/layers/CompassLayer.java index e39b9ae31d..2c4bcb7cf8 100644 --- a/src/gov/nasa/worldwind/layers/CompassLayer.java +++ b/src/gov/nasa/worldwind/layers/CompassLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -15,7 +37,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.view.orbit.OrbitView; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.io.*; @@ -139,7 +161,7 @@ public double getIconScale() * its image file. Values greater than 1 magify the image, values less than one minify it. If the layer's resize * behavior is other than AVKey.RESIZE_KEEP_FIXED_SIZE, the icon's displayed sized is further affected by the value * specified by {@link #setCompassToViewportScale(double)} and the current viewport size. - *

        + *

        * The default icon scale is 0.5. * * @param iconScale the icon scale factor @@ -161,7 +183,7 @@ public String getResizeBehavior() /** * Sets the behavior the layer uses to size the compass icon when the viewport size changes, typically when the - * World Wind window is resized. If the value is AVKey.RESIZE_KEEP_FIXED_SIZE, the icon size is kept to the size + * WorldWind window is resized. If the value is AVKey.RESIZE_KEEP_FIXED_SIZE, the icon size is kept to the size * specified in its image file scaled by the layer's current icon scale. If the value is AVKey.RESIZE_STRETCH, the * icon is resized to have a constant size relative to the current viewport size. If the viewport shrinks the icon * size decreases; if it expands then the icon file enlarges. The relative size is determined by the current diff --git a/src/gov/nasa/worldwind/layers/CrosshairLayer.java b/src/gov/nasa/worldwind/layers/CrosshairLayer.java index 5e49af090c..a831d9f817 100644 --- a/src/gov/nasa/worldwind/layers/CrosshairLayer.java +++ b/src/gov/nasa/worldwind/layers/CrosshairLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -12,7 +34,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.io.*; @@ -150,7 +172,7 @@ public String getResizeBehavior() /** * Sets the behavior the layer uses to size the crosshair icon when the viewport size changes, typically when the - * World Wind window is resized. If the value is AVKey.RESIZE_KEEP_FIXED_SIZE, the icon size is kept to the size + * WorldWind window is resized. If the value is AVKey.RESIZE_KEEP_FIXED_SIZE, the icon size is kept to the size * specified in its image file scaled by the layer's current icon scale. If the value is AVKey.RESIZE_STRETCH, the * icon is resized to have a constant size relative to the current viewport size. If the viewport shrinks the icon * size decreases; if it expands then the icon file enlarges. The relative size is determined by the current diff --git a/src/gov/nasa/worldwind/layers/Earth/BMNGOneImage.java b/src/gov/nasa/worldwind/layers/Earth/BMNGOneImage.java index 660039fee4..57705d0a93 100644 --- a/src/gov/nasa/worldwind/layers/Earth/BMNGOneImage.java +++ b/src/gov/nasa/worldwind/layers/Earth/BMNGOneImage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/BMNGWMSLayer.java b/src/gov/nasa/worldwind/layers/Earth/BMNGWMSLayer.java index 45b5493711..1068523c4c 100644 --- a/src/gov/nasa/worldwind/layers/Earth/BMNGWMSLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/BMNGWMSLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/CountryBoundariesLayer.java b/src/gov/nasa/worldwind/layers/Earth/CountryBoundariesLayer.java index dfcca1859e..1406d29eff 100644 --- a/src/gov/nasa/worldwind/layers/Earth/CountryBoundariesLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/CountryBoundariesLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/LandsatI3WMSLayer.java b/src/gov/nasa/worldwind/layers/Earth/LandsatI3WMSLayer.java index dfd9cddc3f..3a3fdd11e9 100644 --- a/src/gov/nasa/worldwind/layers/Earth/LandsatI3WMSLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/LandsatI3WMSLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/MGRSGraticuleLayer.java b/src/gov/nasa/worldwind/layers/Earth/MGRSGraticuleLayer.java index 8b1a54853d..866cde4e8e 100644 --- a/src/gov/nasa/worldwind/layers/Earth/MGRSGraticuleLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/MGRSGraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/MSVirtualEarthLayer.java b/src/gov/nasa/worldwind/layers/Earth/MSVirtualEarthLayer.java index c701c72d04..b81571f20b 100644 --- a/src/gov/nasa/worldwind/layers/Earth/MSVirtualEarthLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/MSVirtualEarthLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/NASAWFSPlaceNameLayer.java b/src/gov/nasa/worldwind/layers/Earth/NASAWFSPlaceNameLayer.java index 42c81de083..3acb613581 100644 --- a/src/gov/nasa/worldwind/layers/Earth/NASAWFSPlaceNameLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/NASAWFSPlaceNameLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/OSMCycleMapLayer.java b/src/gov/nasa/worldwind/layers/Earth/OSMCycleMapLayer.java index 6e85210c2e..750219b72d 100644 --- a/src/gov/nasa/worldwind/layers/Earth/OSMCycleMapLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/OSMCycleMapLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/OSMMapnikLayer.java b/src/gov/nasa/worldwind/layers/Earth/OSMMapnikLayer.java index 94c56d1069..275a0ffca9 100644 --- a/src/gov/nasa/worldwind/layers/Earth/OSMMapnikLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/OSMMapnikLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/ScankortDenmarkImageLayer.java b/src/gov/nasa/worldwind/layers/Earth/ScankortDenmarkImageLayer.java deleted file mode 100644 index 768944b56a..0000000000 --- a/src/gov/nasa/worldwind/layers/Earth/ScankortDenmarkImageLayer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. - */ - -package gov.nasa.worldwind.layers.Earth; - -import gov.nasa.worldwind.util.WWXML; -import gov.nasa.worldwind.wms.WMSTiledImageLayer; -import gov.nasa.worldwind.avlist.AVKey; -import org.w3c.dom.Document; - -/** - * @author tag - * @version $Id: ScankortDenmarkImageLayer.java 2257 2014-08-22 18:02:19Z tgaskins $ - */ -public class ScankortDenmarkImageLayer extends WMSTiledImageLayer -{ - public ScankortDenmarkImageLayer() - { - super(getConfigurationDocument(), null); - } - - private static Document getConfigurationDocument() - { - return WWXML.openDocumentFile("config/Earth/ScankortDenmarkImageLayer.xml", null); - } - - public String toString() - { - Object o = this.getStringValue(AVKey.DISPLAY_NAME); - return o != null ? (String) o : "Scankort Denmark Imagery"; - } -} diff --git a/src/gov/nasa/worldwind/layers/Earth/USDANAIPWMSImageLayer.java b/src/gov/nasa/worldwind/layers/Earth/USDANAIPWMSImageLayer.java index e00dfbb894..4117f146f7 100644 --- a/src/gov/nasa/worldwind/layers/Earth/USDANAIPWMSImageLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/USDANAIPWMSImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/USGSDigitalOrtho.java b/src/gov/nasa/worldwind/layers/Earth/USGSDigitalOrtho.java index ec67bab8f1..a9be3a6817 100644 --- a/src/gov/nasa/worldwind/layers/Earth/USGSDigitalOrtho.java +++ b/src/gov/nasa/worldwind/layers/Earth/USGSDigitalOrtho.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/USGSTopoHighRes.java b/src/gov/nasa/worldwind/layers/Earth/USGSTopoHighRes.java index c337a53d92..3cbab59e41 100644 --- a/src/gov/nasa/worldwind/layers/Earth/USGSTopoHighRes.java +++ b/src/gov/nasa/worldwind/layers/Earth/USGSTopoHighRes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/USGSTopoLowRes.java b/src/gov/nasa/worldwind/layers/Earth/USGSTopoLowRes.java index d8fbe56e4d..ffb9df4dc4 100644 --- a/src/gov/nasa/worldwind/layers/Earth/USGSTopoLowRes.java +++ b/src/gov/nasa/worldwind/layers/Earth/USGSTopoLowRes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/USGSTopoMedRes.java b/src/gov/nasa/worldwind/layers/Earth/USGSTopoMedRes.java index 013f5c1edc..e84aa1ea75 100644 --- a/src/gov/nasa/worldwind/layers/Earth/USGSTopoMedRes.java +++ b/src/gov/nasa/worldwind/layers/Earth/USGSTopoMedRes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/USGSUrbanAreaOrtho.java b/src/gov/nasa/worldwind/layers/Earth/USGSUrbanAreaOrtho.java index e30a5ea089..9b4cb3586b 100644 --- a/src/gov/nasa/worldwind/layers/Earth/USGSUrbanAreaOrtho.java +++ b/src/gov/nasa/worldwind/layers/Earth/USGSUrbanAreaOrtho.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/UTMBaseGraticuleLayer.java b/src/gov/nasa/worldwind/layers/Earth/UTMBaseGraticuleLayer.java index 238e5a7935..b5a486afc0 100644 --- a/src/gov/nasa/worldwind/layers/Earth/UTMBaseGraticuleLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/UTMBaseGraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/Earth/UTMGraticuleLayer.java b/src/gov/nasa/worldwind/layers/Earth/UTMGraticuleLayer.java index 97d90422c6..c57cd16d8f 100644 --- a/src/gov/nasa/worldwind/layers/Earth/UTMGraticuleLayer.java +++ b/src/gov/nasa/worldwind/layers/Earth/UTMGraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.Earth; diff --git a/src/gov/nasa/worldwind/layers/GARSGraticuleLayer.java b/src/gov/nasa/worldwind/layers/GARSGraticuleLayer.java index 2dd96febe8..99159ee5a3 100644 --- a/src/gov/nasa/worldwind/layers/GARSGraticuleLayer.java +++ b/src/gov/nasa/worldwind/layers/GARSGraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; diff --git a/src/gov/nasa/worldwind/layers/GraticuleRenderingParams.java b/src/gov/nasa/worldwind/layers/GraticuleRenderingParams.java index b19a3dd3f7..637dbd9733 100644 --- a/src/gov/nasa/worldwind/layers/GraticuleRenderingParams.java +++ b/src/gov/nasa/worldwind/layers/GraticuleRenderingParams.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; diff --git a/src/gov/nasa/worldwind/layers/GraticuleSupport.java b/src/gov/nasa/worldwind/layers/GraticuleSupport.java index ba980af0b6..90c7d46db6 100644 --- a/src/gov/nasa/worldwind/layers/GraticuleSupport.java +++ b/src/gov/nasa/worldwind/layers/GraticuleSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -204,7 +226,7 @@ private AVList initRenderingParams(AVList params) if (params.getValue(GraticuleRenderingParams.KEY_LINE_WIDTH) == null) //noinspection UnnecessaryBoxing - params.setValue(GraticuleRenderingParams.KEY_LINE_WIDTH, new Double(1)); + params.setValue(GraticuleRenderingParams.KEY_LINE_WIDTH, Double.valueOf(1)); if (params.getValue(GraticuleRenderingParams.KEY_LINE_STYLE) == null) params.setValue(GraticuleRenderingParams.KEY_LINE_STYLE, GraticuleRenderingParams.VALUE_LINE_STYLE_SOLID); diff --git a/src/gov/nasa/worldwind/layers/IconLayer.java b/src/gov/nasa/worldwind/layers/IconLayer.java index c8395ae6fb..f69102f0c6 100644 --- a/src/gov/nasa/worldwind/layers/IconLayer.java +++ b/src/gov/nasa/worldwind/layers/IconLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -232,7 +254,7 @@ protected Iterable getActiveIcons(DrawContext dc) * maintain a reference to iconIterable strictly for picking and rendering. This layer will not modify * the Iterable reference. However, this will clear the internal collection of Icons, and will prevent any * modification to its contents via addIcon, addIcons, or removeIcons. - *

        + *

        * If the specified iconIterable is null, this layer will revert to maintaining its internal * collection. * diff --git a/src/gov/nasa/worldwind/layers/LatLonGraticuleLayer.java b/src/gov/nasa/worldwind/layers/LatLonGraticuleLayer.java index 57fa0b4a76..44807da381 100644 --- a/src/gov/nasa/worldwind/layers/LatLonGraticuleLayer.java +++ b/src/gov/nasa/worldwind/layers/LatLonGraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; diff --git a/src/gov/nasa/worldwind/layers/Layer.java b/src/gov/nasa/worldwind/layers/Layer.java index 504e9087f5..2f31a31ecc 100644 --- a/src/gov/nasa/worldwind/layers/Layer.java +++ b/src/gov/nasa/worldwind/layers/Layer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -46,7 +68,7 @@ public interface Layer extends WWObject, Disposable, Restorable /** * Returns the layer's opacity, the degree to which it is blended with underlying layers. - *

        + *

        * Many layers apply special usage of opacity, and some ignore it in favor of the opacity settings of their internal * renderables. See the description of this method in specific layers to determine usage there. * @@ -56,7 +78,7 @@ public interface Layer extends WWObject, Disposable, Restorable /** * Sets the layer's opacity, the degree to which it is blended with underlying layers. - *

        + *

        * Many layers apply special usage of opacity, and some ignore it in favor of the opacity settings of their internal * renderables. See the description of this method in specific layers to determine usage there. * @@ -67,7 +89,7 @@ public interface Layer extends WWObject, Disposable, Restorable /** * Indicates whether the layer performs selection during picking. - *

        + *

        * Most layers enable picking by default. However, this becomes inconvenient for {@link * gov.nasa.worldwind.render.SurfaceImage} and {@link gov.nasa.worldwind.layers.SurfaceImageLayer}} when the image * covers a large area because the view input handlers detect the surface image rather than the terrain as the top @@ -224,7 +246,7 @@ public interface Layer extends WWObject, Disposable, Restorable /** * Indicates the altitude above which this layer likely has low value or is not expected to be active. This value is * independent of the maximum active altitude, {@link #setMaxActiveAltitude(double)} and does not reflect it. - *

        + *

        * The returned altitude is valid when the field of view indicated by {@link gov.nasa.worldwind.View#getFieldOfView()} * is set to its default value. Changing the field of view to any value other than the default may change this * layer's maximum effective altitude, but the returned altitude will not reflect that change. @@ -239,7 +261,7 @@ public interface Layer extends WWObject, Disposable, Restorable /** * Indicates the altitude below which this layer likely has low value or is not expected to be active. This value is * independent of the minimum active altitude, {@link #setMinActiveAltitude(double)} and does not reflect it. - *

        + *

        * The returned altitude is valid when the field of view indicated by {@link gov.nasa.worldwind.View#getFieldOfView()} * is set to its default value. Changing the field of view to any value other than the default may change this * layer's minimum effective altitude, but the returned altitude will not reflect that change. diff --git a/src/gov/nasa/worldwind/layers/LayerList.java b/src/gov/nasa/worldwind/layers/LayerList.java index 52ab917a54..2ea6ec5099 100644 --- a/src/gov/nasa/worldwind/layers/LayerList.java +++ b/src/gov/nasa/worldwind/layers/LayerList.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; diff --git a/src/gov/nasa/worldwind/layers/LocalRasterServerLayer.java b/src/gov/nasa/worldwind/layers/LocalRasterServerLayer.java index 662fcd64b1..83833929af 100644 --- a/src/gov/nasa/worldwind/layers/LocalRasterServerLayer.java +++ b/src/gov/nasa/worldwind/layers/LocalRasterServerLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -25,9 +47,9 @@ public class LocalRasterServerLayer extends BasicTiledImageLayer { /** * Constructs a layer from a list of parameters describing the layer. - *

        + *

        * Parameter values for DATASET_NAME and DATA_CACHE_NAME are required. - *

        + *

        * TODO: Enumerate the other required and optional parameters. * * @param params the parameters describing the dataset. @@ -44,9 +66,9 @@ public LocalRasterServerLayer(AVList params) /** * Constructs a layer from an XML document description. - *

        + *

        * Either the specified XML document or parameter list must contain values for DATASET_NAME and DATA_CACHE_NAME. - *

        + *

        * TODO: Enumerate the other required and optional parameters. * * @param dom the XML document describing the dataset. @@ -66,9 +88,9 @@ public LocalRasterServerLayer(Document dom, AVList params) /** * Constructs a layer from an XML document {@link Element}. - *

        + *

        * Either the specified XML element or parameter list must contain values for DATASET_NAME and DATA_CACHE_NAME. - *

        + *

        * TODO: Enumerate the other required and optional parameters. * * @param domElement the XML document describing the dataset. diff --git a/src/gov/nasa/worldwind/layers/MarkerLayer.java b/src/gov/nasa/worldwind/layers/MarkerLayer.java index 439060c64a..9f6215b9e0 100644 --- a/src/gov/nasa/worldwind/layers/MarkerLayer.java +++ b/src/gov/nasa/worldwind/layers/MarkerLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; diff --git a/src/gov/nasa/worldwind/layers/RenderableLayer.java b/src/gov/nasa/worldwind/layers/RenderableLayer.java index c966704893..bba37c17c8 100644 --- a/src/gov/nasa/worldwind/layers/RenderableLayer.java +++ b/src/gov/nasa/worldwind/layers/RenderableLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -12,7 +34,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; @@ -39,7 +61,7 @@ public RenderableLayer() * Adds the specified renderable to the end of this layer's internal collection. If this layer's * internal collection has been overridden with a call to {@link #setRenderables(Iterable)}, this will throw an * exception. - *

        + *

        * If the renderable implements {@link gov.nasa.worldwind.avlist.AVList}, the layer forwards its * property change events to the layer's property change listeners. Any property change listeners the layer attaches * to the renderable are removed in {@link #removeRenderable(gov.nasa.worldwind.render.Renderable)}, @@ -78,7 +100,7 @@ public void addRenderable(Renderable renderable) * Inserts the specified renderable at the specified index in this layer's internal * collection. If this layer's internal collection has been overridden with a call to {@link * #setRenderables(Iterable)}, this will throw an exception. - *

        + *

        * If the renderable implements {@link gov.nasa.worldwind.avlist.AVList}, the layer forwards its * property change events to the layer's property change listeners. Any property change listeners the layer attaches * to the renderable are removed in {@link #removeRenderable(gov.nasa.worldwind.render.Renderable)}, @@ -133,7 +155,7 @@ public void addRenderable(int index, Renderable renderable) * Adds the contents of the specified renderables to this layer's internal collection. If this layer's * internal collection has been overriden with a call to {@link #setRenderables(Iterable)}, this will throw an * exception. - *

        + *

        * If any of the renderables implement {@link gov.nasa.worldwind.avlist.AVList}, the layer forwards * their property change events to the layer's property change listeners. Any property change listeners the layer * attaches to the renderable are removed in {@link #removeRenderable(gov.nasa.worldwind.render.Renderable)}, @@ -177,7 +199,7 @@ public void addRenderables(Iterable renderables) * Removes the specified renderable from this layer's internal collection, if it exists. If this * layer's internal collection has been overridden with a call to {@link #setRenderables(Iterable)}, this will throw * an exception. - *

        + *

        * If the renderable implements {@link gov.nasa.worldwind.avlist.AVList}, this stops forwarding the its * property change events to the layer's property change listeners. Any property change listeners the layer attached * to the renderable in {@link #addRenderable(gov.nasa.worldwind.render.Renderable)} or {@link @@ -215,7 +237,7 @@ public void removeRenderable(Renderable renderable) /** * Clears the contents of this layer's internal Renderable collection. If this layer's internal collection has been * overriden with a call to {@link #setRenderables(Iterable)}, this will throw an exception. - *

        + *

        * If any of the renderables implement {@link gov.nasa.worldwind.avlist.AVList}, this stops forwarding * their property change events to the layer's property change listeners. Any property change listeners the layer * attached to the renderables in {@link #addRenderable(gov.nasa.worldwind.render.Renderable)} or @@ -311,14 +333,14 @@ protected Iterable getActiveRenderables() * will not modify the reference, or dispose of its contents. This will also clear and dispose of the internal * collection of Renderables, and will prevent any modification to its contents via addRenderable, * addRenderables, removeRenderables, or dispose. - *

        + *

        * Unlike {@link #addRenderable(gov.nasa.worldwind.render.Renderable)} or {@link #addRenderables(Iterable)}, this * does not forward any of the renderable's property change events to the layer's property change listeners. Since * the layer is not in control of the iIterable's contents, attaching property change listeners to the renderables * could cause the them to hold dangling references to the layer. If any of the renderables in the Iterable rely on * forwarding property change events for proper operation - such as {@link gov.nasa.worldwind.render.AbstractBrowserBalloon} * - use {@link #addRenderables(Iterable)} instead. - *

        + *

        * If the specified renderableIterable is null, this layer reverts to maintaining its internal * collection. * @@ -360,7 +382,7 @@ public double getOpacity() /** * Disposes the contents of this layer's internal Renderable collection, but does not remove any elements from that * collection. - *

        + *

        * If any of layer's internal Renderables implement {@link gov.nasa.worldwind.avlist.AVList}, this stops forwarding * their property change events to the layer's property change listeners. Any property change listeners the layer * attached to the renderables in {@link #addRenderable(gov.nasa.worldwind.render.Renderable)} or @@ -524,7 +546,7 @@ public String toString() /** * {@inheritDoc} - *

        + *

        * This implementation forwards the message to each Renderable that implements {@link MessageListener}. * * @param message The message that was received. diff --git a/src/gov/nasa/worldwind/layers/ScalebarLayer.java b/src/gov/nasa/worldwind/layers/ScalebarLayer.java index ace39555ce..03f495b886 100644 --- a/src/gov/nasa/worldwind/layers/ScalebarLayer.java +++ b/src/gov/nasa/worldwind/layers/ScalebarLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -11,7 +33,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.awt.geom.*; diff --git a/src/gov/nasa/worldwind/layers/SkyColorLayer.java b/src/gov/nasa/worldwind/layers/SkyColorLayer.java index 3c8138aa39..c98c209005 100644 --- a/src/gov/nasa/worldwind/layers/SkyColorLayer.java +++ b/src/gov/nasa/worldwind/layers/SkyColorLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.render.DrawContext; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; /** diff --git a/src/gov/nasa/worldwind/layers/SkyGradientLayer.java b/src/gov/nasa/worldwind/layers/SkyGradientLayer.java index 9e139c81ee..b1fdd4e3aa 100644 --- a/src/gov/nasa/worldwind/layers/SkyGradientLayer.java +++ b/src/gov/nasa/worldwind/layers/SkyGradientLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -10,13 +32,13 @@ import gov.nasa.worldwind.render.DrawContext; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; /** * Renders an atmosphere around the globe and a sky dome at low altitude. - *

        - * Note : based on a spherical globe.
        Issue : Ellipsoidal globe doesnt match the spherical atmosphere everywhere. + *

        + * Note : based on a spherical globe.
        Issue : Ellipsoidal globe doesnt match the spherical atmosphere everywhere. * * @author Patrick Murris * @version $Id: SkyGradientLayer.java 2146 2014-07-11 17:37:04Z tgaskins $ diff --git a/src/gov/nasa/worldwind/layers/StarsConvertor.java b/src/gov/nasa/worldwind/layers/StarsConvertor.java index 7ec22fe028..4e7beb86e3 100644 --- a/src/gov/nasa/worldwind/layers/StarsConvertor.java +++ b/src/gov/nasa/worldwind/layers/StarsConvertor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; diff --git a/src/gov/nasa/worldwind/layers/StarsLayer.java b/src/gov/nasa/worldwind/layers/StarsLayer.java index 15c2a1df45..47a57e24a7 100644 --- a/src/gov/nasa/worldwind/layers/StarsLayer.java +++ b/src/gov/nasa/worldwind/layers/StarsLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -11,7 +33,7 @@ import gov.nasa.worldwind.render.DrawContext; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.io.*; import java.nio.*; diff --git a/src/gov/nasa/worldwind/layers/SurfaceImageLayer.java b/src/gov/nasa/worldwind/layers/SurfaceImageLayer.java index b4b3cfe844..e7ea1a6c59 100644 --- a/src/gov/nasa/worldwind/layers/SurfaceImageLayer.java +++ b/src/gov/nasa/worldwind/layers/SurfaceImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -20,7 +42,7 @@ /** * Displays a collection of local images on the globe. - *

        + *

        * Note: The view input handlers detect surface images rather than the terrain as the top picked object in {@link * gov.nasa.worldwind.event.SelectEvent}s and will not respond to the user's attempts at navigation when the cursor is * over the image. If this is not the desired behavior, disable picking for the layer containing the surface image. @@ -45,14 +67,14 @@ public void dispose() } /** - * Add an image to the collection, reprojecting it to geographic (latitude & longitude) coordinates if necessary. + * Add an image to the collection, reprojecting it to geographic (latitude and longitude) coordinates if necessary. * The image's location is determined from metadata files co-located with the image file. The number, names and * contents of these files are governed by the type of the specified image. Location metadata must be available. - *

        + *

        * If projection information is available and reprojection of the image's projection type is supported, the image * will be reprojected to geographic coordinates. If projection information is not available then it's assumed that * the image is already in geographic projection. - *

        + *

        * Only reprojection from UTM is currently provided. * * @param imagePath the path to the image file. @@ -183,7 +205,7 @@ protected DataRaster openDataRaster(Object src, AVList params) /** * Add an image to the collection and specify its coverage. The image is assumed to be in geographic projection - * (latitude & longitude). + * (latitude and longitude). * * @param imagePath the path to the image file. * @param sector the geographic location of the image. @@ -219,7 +241,7 @@ public void addImage(String imagePath, Sector sector) throws IOException, WWRunt /** * Add a {@link BufferedImage} to the collection at an explicitly specified location. The image is assumed to be in - * geographic projection (latitude & longitude). + * geographic projection (latitude and longitude). * * @param name a unique name to associate with the image so that it can be subsequently referred to without having * to keep a reference to the image itself. Use this name in calls to {@link #removeImage(String)}. @@ -286,7 +308,7 @@ public void newTile(BufferedImage tileImage, List corners) /** * Add an image to the collection at an explicitly specified location. The image is assumed to be in geographic - * projection (latitude & longitude). + * projection (latitude and longitude). * * @param imagePath the path to the image file. * @param corners the geographic location of the image's corners, specified in order of lower-left, lower-right, @@ -323,7 +345,7 @@ public void addImage(String imagePath, List corners) throws IO /** * Add a {@link BufferedImage} to the collection at an explicitly specified location. The image is assumed to be in - * geographic projection (latitude & longitude). + * geographic projection (latitude and longitude). * * @param name a unique name to associate with the image so that it can be subsequently referred to without * having to keep a reference to the image itself. Use this name in calls to {@link diff --git a/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java b/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java index 1d7f35e3de..d675ad6699 100644 --- a/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java +++ b/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -14,7 +36,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.view.orbit.OrbitView; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.awt.geom.*; import java.beans.PropertyChangeEvent; @@ -22,15 +44,16 @@ import java.util.List; /** - * Displays a terrain profile graph in a screen corner.

        Usage: do setEventSource(wwd) to have the graph - * activated and updated with position changes. See public properties for options: keepProportions, follow, unit, start - * and end latlon...

        + * Displays a terrain profile graph in a screen corner. + *

        + * Usage: do setEventSource(wwd) to have the graph activated and updated with position changes. See public properties + * for options: keepProportions, follow, unit, start and end latlon...

        * * @author Patrick Murris * @version $Id: TerrainProfileLayer.java 2053 2014-06-10 20:16:57Z tgaskins $ */ -public class TerrainProfileLayer extends AbstractLayer implements PositionListener, SelectListener -{ +public class TerrainProfileLayer extends AbstractLayer implements PositionListener, SelectListener { + // Units constants public final static String UNIT_METRIC = "gov.nasa.worldwind.TerrainProfileLayer.Metric"; public final static String UNIT_IMPERIAL = "gov.nasa.worldwind.TerrainProfileLayer.Imperial"; @@ -68,8 +91,8 @@ public class TerrainProfileLayer extends AbstractLayer implements PositionListen protected boolean showPickedLine = true; // True to show the picked position line on the terrain protected int pickedSample = -1; // Picked sample number if not -1 - Polyline selectionShape; // Shape showing section on the ground - Polyline pickedShape; // Shape showing actual pick position on the ground + Path selectionShape; // Shape showing section on the ground + Path pickedShape; // Shape showing actual pick position on the ground protected boolean keepProportions = false; // Keep graph distance/elevation proportions protected boolean zeroBased = true; // Pad graph elevation scale to include sea level if true protected String follow = FOLLOW_VIEW; // Profile position follow behavior @@ -80,7 +103,7 @@ public class TerrainProfileLayer extends AbstractLayer implements PositionListen protected Position objectPosition; // Object position if FOLLOW_OBJECT protected Angle objectHeading; // Object heading if FOLLOW_OBJECT protected ArrayList pathPositions; // Path position list if FOLLOW_PATH - protected int pathType = Polyline.GREAT_CIRCLE; + protected String pathType = AVKey.GREAT_CIRCLE; // Terrain profile data protected int samples = 250; // Number of position samples @@ -95,51 +118,50 @@ public class TerrainProfileLayer extends AbstractLayer implements PositionListen // Draw it as ordered with an eye distance of 0 so that it shows up in front of most other things. protected OrderedIcon orderedImage = new OrderedIcon(); - protected class OrderedIcon implements OrderedRenderable - { - public double getDistanceFromEye() - { + protected class OrderedIcon implements OrderedRenderable { + + @Override + public double getDistanceFromEye() { return 0; } - public void pick(DrawContext dc, Point pickPoint) - { + @Override + public void pick(DrawContext dc, Point pickPoint) { TerrainProfileLayer.this.drawProfile(dc); } - public void render(DrawContext dc) - { + @Override + public void render(DrawContext dc) { TerrainProfileLayer.this.drawProfile(dc); } } - /** Renders a terrain profile graphic in a screen corner. */ - public TerrainProfileLayer() - { + /** + * Renders a terrain profile graphic in a screen corner. + */ + public TerrainProfileLayer() { } // ** Public properties ************************************************************ - /** * Get whether the profile graph is minimized. * * @return true if the profile graph is minimized. */ @SuppressWarnings({"UnusedDeclaration"}) - public boolean getIsMinimized() - { + public boolean getIsMinimized() { return this.isMinimized; } /** - * Set whether the profile graph should be minimized.

        Note that the graph can be both minimized and maximized at - * the same time. The minimized state will take precedence and the graph will display as an icon. When - * 'un-minimized' it will display as maximized.

        + * Set whether the profile graph should be minimized. + *

        + * Note that the graph can be both minimized and maximized at the same time. The minimized state will take + * precedence and the graph will display as an icon. When 'un-minimized' it will display as maximized.

        * * @param state true if the profile should be minimized. */ - public void setIsMinimized(boolean state) - { + public void setIsMinimized(boolean state) { this.isMinimized = state; this.pickedSample = -1; // Clear picked position } @@ -150,18 +172,16 @@ public void setIsMinimized(boolean state) * @return true if the profile graph is maximized. */ @SuppressWarnings({"UnusedDeclaration"}) - public boolean getIsMaximized() - { + public boolean getIsMaximized() { return this.isMaximized; } /** - * Set wheter the profile graph should be maximized - displays over the whole viewport. + * Set whether the profile graph should be maximized - displays over the whole viewport. * * @param state true if the profile should be maximized. */ - public void setIsMaximized(boolean state) - { + public void setIsMaximized(boolean state) { this.isMaximized = state; } @@ -170,8 +190,7 @@ public void setIsMaximized(boolean state) * * @return the scalebar graphic Dimension. */ - public Dimension getSize() - { + public Dimension getSize() { return this.size; } @@ -180,10 +199,8 @@ public Dimension getSize() * * @param size the graphic Dimension. */ - public void setSize(Dimension size) - { - if (size == null) - { + public void setSize(Dimension size) { + if (size == null) { String message = Logging.getMessage("nullValue.DimensionIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); @@ -196,8 +213,7 @@ public void setSize(Dimension size) * * @return the graphic Color. */ - public Color getColor() - { + public Color getColor() { return this.color; } @@ -206,10 +222,8 @@ public Color getColor() * * @param color the graphic Color. */ - public void setColor(Color color) - { - if (color == null) - { + public void setColor(Color color) { + if (color == null) { String msg = Logging.getMessage("nullValue.ColorIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -226,8 +240,7 @@ public void setColor(Color color) * @see #setColor */ @Override - public void setOpacity(double opacity) - { + public void setOpacity(double opacity) { super.setOpacity(opacity); } @@ -240,8 +253,7 @@ public void setOpacity(double opacity) * @see #getColor */ @Override - public double getOpacity() - { + public double getOpacity() { return super.getOpacity(); } @@ -251,8 +263,7 @@ public double getOpacity() * @return the graphic-to-viewport scale factor. */ @SuppressWarnings({"UnusedDeclaration"}) - public double getToViewportScale() - { + public double getToViewportScale() { return toViewportScale; } @@ -265,13 +276,11 @@ public double getToViewportScale() * @param toViewportScale the graphic to viewport scale factor. */ @SuppressWarnings({"UnusedDeclaration"}) - public void setToViewportScale(double toViewportScale) - { + public void setToViewportScale(double toViewportScale) { this.toViewportScale = toViewportScale; } - public String getPosition() - { + public String getPosition() { return this.position; } @@ -282,10 +291,8 @@ public String getPosition() * * @param position the desired graphic position. */ - public void setPosition(String position) - { - if (position == null) - { + public void setPosition(String position) { + if (position == null) { String msg = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -299,8 +306,7 @@ public void setPosition(String position) * @return the screen location of the graph center if set (can be null). */ @SuppressWarnings({"UnusedDeclaration"}) - public Point getLocationCenter() - { + public Point getLocationCenter() { return this.locationCenter; } @@ -309,8 +315,7 @@ public Point getLocationCenter() * * @param point the screen location of the graph center (can be null). */ - public void setLocationCenter(Point point) - { + public void setLocationCenter(Point point) { this.locationCenter = point; } @@ -321,8 +326,7 @@ public void setLocationCenter(Point point) * @return the location offset. Will be null if no offset has been specified. */ @SuppressWarnings({"UnusedDeclaration"}) - public Vec4 getLocationOffset() - { + public Vec4 getLocationOffset() { return locationOffset; } @@ -330,14 +334,13 @@ public Vec4 getLocationOffset() * Specifies a placement offset from the layer position on the screen. * * @param locationOffset the number of pixels to shift the layer image from its specified screen position. A - * positive X value shifts the image to the right. A positive Y value shifts the image up. If - * null, no offset is applied. The default offset is null. + * positive X value shifts the image to the right. A positive Y value shifts the image up. If null, no offset is + * applied. The default offset is null. * * @see #setLocationCenter * @see #setPosition */ - public void setLocationOffset(Vec4 locationOffset) - { + public void setLocationOffset(Vec4 locationOffset) { this.locationOffset = locationOffset; } @@ -347,8 +350,7 @@ public void setLocationOffset(Vec4 locationOffset) * @return the layer's resize behavior. */ @SuppressWarnings({"UnusedDeclaration"}) - public String getResizeBehavior() - { + public String getResizeBehavior() { return resizeBehavior; } @@ -364,13 +366,11 @@ public String getResizeBehavior() * @param resizeBehavior the desired resize behavior */ @SuppressWarnings({"UnusedDeclaration"}) - public void setResizeBehavior(String resizeBehavior) - { + public void setResizeBehavior(String resizeBehavior) { this.resizeBehavior = resizeBehavior; } - public int getBorderWidth() - { + public int getBorderWidth() { return borderWidth; } @@ -380,14 +380,12 @@ public int getBorderWidth() * @param borderWidth the number of pixels to offset the graphic from the borders indicated by {@link * #setPosition(String)}. */ - public void setBorderWidth(int borderWidth) - { + public void setBorderWidth(int borderWidth) { this.borderWidth = borderWidth; } @SuppressWarnings({"UnusedDeclaration"}) - public String getUnit() - { + public String getUnit() { return this.unit; } @@ -397,8 +395,7 @@ public String getUnit() * * @param unit the desired unit. */ - public void setUnit(String unit) - { + public void setUnit(String unit) { this.unit = unit; } @@ -407,8 +404,7 @@ public void setUnit(String unit) * * @return the graphic legend Font. */ - public Font getFont() - { + public Font getFont() { return this.defaultFont; } @@ -417,10 +413,8 @@ public Font getFont() * * @param font the graphic legend Font. */ - public void setFont(Font font) - { - if (font == null) - { + public void setFont(Font font) { + if (font == null) { String msg = Logging.getMessage("nullValue.FontIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -433,8 +427,7 @@ public void setFont(Font font) * * @return true if the graph maintains distance/elevation proportions. */ - public boolean getKeepProportions() - { + public boolean getKeepProportions() { return this.keepProportions; } @@ -443,8 +436,7 @@ public boolean getKeepProportions() * * @param state true if the graph should maintains distance/elevation proportions. */ - public void setKeepProportions(boolean state) - { + public void setKeepProportions(boolean state) { this.keepProportions = state; } @@ -453,8 +445,7 @@ public void setKeepProportions(boolean state) * * @return the graph center point placement behavior. */ - public String getFollow() - { + public String getFollow() { return this.follow; } @@ -466,8 +457,7 @@ public String getFollow() * * @param behavior the graph center point placement behavior. */ - public void setFollow(String behavior) - { + public void setFollow(String behavior) { this.follow = behavior; } @@ -476,8 +466,7 @@ public void setFollow(String behavior) * * @return true if the eye or object position is shown on the graph. */ - public boolean getShowEyePosition() - { + public boolean getShowEyePosition() { return this.showEyePosition; } @@ -487,8 +476,7 @@ public boolean getShowEyePosition() * * @param state if true the eye or object position should be shown on the graph. */ - public void setShowEyePosition(Boolean state) - { + public void setShowEyePosition(Boolean state) { this.showEyePosition = state; } @@ -497,8 +485,7 @@ public void setShowEyePosition(Boolean state) * * @param factor the new profile length factor. */ - public void setProfileLengthFactor(double factor) - { + public void setProfileLengthFactor(double factor) { this.profileLengthFactor = factor; } @@ -507,8 +494,7 @@ public void setProfileLengthFactor(double factor) * * @return the profile length factor. */ - public double getProfileLenghtFactor() - { + public double getProfileLenghtFactor() { return this.profileLengthFactor; } @@ -518,8 +504,7 @@ public double getProfileLenghtFactor() * @return the profile start position lat/lon. */ @SuppressWarnings({"UnusedDeclaration"}) - public LatLon getStartLatLon() - { + public LatLon getStartLatLon() { return this.startLatLon; } @@ -528,10 +513,8 @@ public LatLon getStartLatLon() * * @param latLon the profile start position lat/lon. */ - public void setStartLatLon(LatLon latLon) - { - if (latLon == null) - { + public void setStartLatLon(LatLon latLon) { + if (latLon == null) { String msg = Logging.getMessage("nullValue.LatLonIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -545,8 +528,7 @@ public void setStartLatLon(LatLon latLon) * @return the profile end position lat/lon. */ @SuppressWarnings({"UnusedDeclaration"}) - public LatLon getEndLatLon() - { + public LatLon getEndLatLon() { return this.endLatLon; } @@ -555,10 +537,8 @@ public LatLon getEndLatLon() * * @param latLon the profile end position lat/lon. */ - public void setEndLatLon(LatLon latLon) - { - if (latLon == null) - { + public void setEndLatLon(LatLon latLon) { + if (latLon == null) { String msg = Logging.getMessage("nullValue.LatLonIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -572,8 +552,7 @@ public void setEndLatLon(LatLon latLon) * @return the number of elevation samples in the profile. */ @SuppressWarnings({"UnusedDeclaration"}) - public int getSamples() - { + public int getSamples() { return this.samples; } @@ -583,8 +562,7 @@ public int getSamples() * @param number the number of elevation samples in the profile. */ @SuppressWarnings({"UnusedDeclaration"}) - public void setSamples(int number) - { + public void setSamples(int number) { this.samples = Math.abs(number); } @@ -593,8 +571,7 @@ public void setSamples(int number) * * @return whether the profile graph should include sea level. */ - public boolean getZeroBased() - { + public boolean getZeroBased() { return this.zeroBased; } @@ -603,8 +580,7 @@ public boolean getZeroBased() * * @param state true if the profile graph should include sea level. */ - public void setZeroBased(boolean state) - { + public void setZeroBased(boolean state) { this.zeroBased = state; } @@ -614,8 +590,7 @@ public void setZeroBased(boolean state) * @return the object position the graph follows. */ @SuppressWarnings({"UnusedDeclaration"}) - public Position getObjectPosition() - { + public Position getObjectPosition() { return this.objectPosition; } @@ -624,8 +599,7 @@ public Position getObjectPosition() * * @param pos the object position the graph follows. */ - public void setObjectPosition(Position pos) - { + public void setObjectPosition(Position pos) { this.objectPosition = pos; } @@ -636,8 +610,7 @@ public void setObjectPosition(Position pos) * @return the object heading the graph follows. */ @SuppressWarnings({"UnusedDeclaration"}) - public Angle getObjectHeading() - { + public Angle getObjectHeading() { return this.objectHeading; } @@ -647,8 +620,7 @@ public Angle getObjectHeading() * * @param heading the object heading the graph follows. */ - public void setObjectHeading(Angle heading) - { + public void setObjectHeading(Angle heading) { this.objectHeading = heading; } @@ -658,20 +630,17 @@ public void setObjectHeading(Angle heading) * @return the path positions that the profile follows. */ @SuppressWarnings({"UnusedDeclaration"}) - public List getPathPositions() - { + public List getPathPositions() { return this.pathPositions; } /** - * Set the path positions that the profile should follow if {@link #FOLLOW_PATH}. + * Set the path positions that the profile should follow if {@link #FOLLOW_PATH}. * * @param positions the path positions that the profile should follow. */ - public void setPathPositions(ArrayList positions) - { - if (positions == null) - { + public void setPathPositions(ArrayList positions) { + if (positions == null) { String msg = Logging.getMessage("nullValue.PositionsListIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -679,43 +648,78 @@ public void setPathPositions(ArrayList positions) this.pathPositions = positions; } - @SuppressWarnings({"UnusedDeclaration"}) - public int getPathType() - { + @Deprecated + public int getPathType() { + switch (pathType) { + case AVKey.LINEAR: + return Polyline.LINEAR; + case AVKey.RHUMB_LINE: + return Polyline.RHUMB_LINE; + case AVKey.GREAT_CIRCLE: + return Polyline.GREAT_CIRCLE; + default: + String message = Logging.getMessage("generic.ArgumentOutOfRange"); + Logging.logger().severe(message); + throw new IllegalArgumentException(message); + } + } + + public String getAVKeyPathType() { return this.pathType; } /** - * Sets the type of path to follow, one of {@link Polyline#GREAT_CIRCLE}, which computes each segment of the path as - * a great circle, or {@link Polyline#RHUMB_LINE}, which computes each segment of the path as a line of constant - * heading. + * Sets the type of path to follow, one of {@link AVKey#GREAT_CIRCLE}, which computes each segment of the path as a + * great circle, or {@link AVKey#RHUMB_LINE}, which computes each segment of the path as a line of constant heading. * - * @param type the type of path to follow. + * @param pathType the type of path to follow. */ - public void setPathType(int type) - { - this.pathType = type; + @Deprecated + public void setPathType(int pathType) { + switch (pathType) { + case Polyline.LINEAR: + this.pathType = AVKey.LINEAR; + break; + case Polyline.RHUMB_LINE: + this.pathType = AVKey.RHUMB_LINE; + break; + case Polyline.GREAT_CIRCLE: + this.pathType = AVKey.GREAT_CIRCLE; + break; + default: + String message = Logging.getMessage("generic.ArgumentOutOfRange"); + Logging.logger().severe(message); + throw new IllegalArgumentException(message); + } } /** - * Get the Polyline used to render the profile line on the ground. + * Sets the type of path to follow, one of {@link AVKey#GREAT_CIRCLE}, which computes each segment of the path as a + * great circle, or {@link AVKey#RHUMB_LINE}, which computes each segment of the path as a line of constant heading. * - * @return the Polyline used to render the profile line on the ground. + * @param pathType the type of path to follow. + */ + public void setPathType(String pathType) { + this.pathType = pathType; + } + + /** + * Get the Path used to render the profile line on the ground. + * + * @return the Path used to render the profile line on the ground. */ @SuppressWarnings({"UnusedDeclaration"}) - public Polyline getProfileLine() - { + public Path getProfileLine() { return this.selectionShape; } /** - * Get the Polyline used to render the picked position on the terrain. + * Get the Path used to render the picked position on the terrain. * - * @return the Polyline used to render the picked position on the terrain. + * @return the Path used to render the picked position on the terrain. */ @SuppressWarnings({"UnusedDeclaration"}) - public Polyline getPickedLine() - { + public Path getPickedLine() { return this.selectionShape; } @@ -725,8 +729,7 @@ public Polyline getPickedLine() * @return true is the profile line is displayed over the ground. */ @SuppressWarnings({"UnusedDeclaration"}) - public boolean isShowProfileLine() - { + public boolean isShowProfileLine() { return this.showProfileLine; } @@ -735,8 +738,7 @@ public boolean isShowProfileLine() * * @param state true if the profile line should be displayed over the terrain. */ - public void setShowProfileLine(boolean state) - { + public void setShowProfileLine(boolean state) { this.showProfileLine = state; } @@ -746,8 +748,7 @@ public void setShowProfileLine(boolean state) * @return true if the picked line is displayed over the ground. */ @SuppressWarnings({"UnusedDeclaration"}) - public boolean isShowPickedLine() - { + public boolean isShowPickedLine() { return this.showPickedLine; } @@ -757,62 +758,59 @@ public boolean isShowPickedLine() * @param state if the picked line should be displayed over the ground. */ @SuppressWarnings({"UnusedDeclaration"}) - public void setShowPickedLine(boolean state) - { + public void setShowPickedLine(boolean state) { this.showPickedLine = state; } // ** Rendering ************************************************************ - @Override - public void doRender(DrawContext dc) - { + public void doRender(DrawContext dc) { // Delegate graph rendering to OrderedRenderable list dc.addOrderedRenderable(this.orderedImage); // Render section line on the ground now - if (!isMinimized && this.positions != null && this.selectionShape != null) - { - if (this.showProfileLine) + if (!isMinimized && this.positions != null && this.selectionShape != null) { + if (this.showProfileLine) { this.selectionShape.render(dc); + } // If picking in progress, render pick indicator - if (this.showPickedLine && this.pickedSample != -1 && this.pickedShape != null) + if (this.showPickedLine && this.pickedSample != -1 && this.pickedShape != null) { this.pickedShape.render(dc); + } } } @Override - public void doPick(DrawContext dc, Point pickPoint) - { + public void doPick(DrawContext dc, Point pickPoint) { dc.addOrderedRenderable(this.orderedImage); } - protected void initialize(DrawContext dc) - { - if (this.initialized || this.positions != null) + protected void initialize(DrawContext dc) { + if (this.initialized || this.positions != null) { return; + } - if (this.wwd != null) - { + if (this.wwd != null) { this.computeProfile(dc); // this.expirySupport.restart(dc); } - if (this.positions != null) + if (this.positions != null) { this.initialized = true; + } } // Profile graph rendering - ortho - - public void drawProfile(DrawContext dc) - { + public void drawProfile(DrawContext dc) { this.computeProfile(dc); if ((this.positions == null || (this.minElevation == 0 && this.maxElevation == 0)) - && !this.initialized) + && !this.initialized) { this.initialize(dc); + } - if (this.positions == null || (this.minElevation == 0 && this.maxElevation == 0)) + if (this.positions == null || (this.minElevation == 0 && this.maxElevation == 0)) { return; + } GL2 gl = dc.getGL().getGL2(); // GL initialization checks for GL2 compatibility. @@ -820,14 +818,13 @@ public void drawProfile(DrawContext dc) boolean modelviewPushed = false; boolean projectionPushed = false; - try - { + try { gl.glPushAttrib(GL2.GL_DEPTH_BUFFER_BIT - | GL2.GL_COLOR_BUFFER_BIT - | GL2.GL_ENABLE_BIT - | GL2.GL_TRANSFORM_BIT - | GL2.GL_VIEWPORT_BIT - | GL2.GL_CURRENT_BIT); + | GL2.GL_COLOR_BUFFER_BIT + | GL2.GL_ENABLE_BIT + | GL2.GL_TRANSFORM_BIT + | GL2.GL_VIEWPORT_BIT + | GL2.GL_CURRENT_BIT); attribsPushed = true; gl.glDisable(GL.GL_TEXTURE_2D); // no textures @@ -837,9 +834,9 @@ public void drawProfile(DrawContext dc) gl.glDisable(GL.GL_DEPTH_TEST); Rectangle viewport = dc.getView().getViewport(); - Dimension drawSize = isMinimized ? new Dimension(MINIMIZED_SIZE, MINIMIZED_SIZE) : - isMaximized ? new Dimension(viewport.width - this.borderWidth * 2, - viewport.height * 2 / 3 - this.borderWidth * 2) : this.size; + Dimension drawSize = isMinimized ? new Dimension(MINIMIZED_SIZE, MINIMIZED_SIZE) + : isMaximized ? new Dimension(viewport.width - this.borderWidth * 2, + viewport.height * 2 / 3 - this.borderWidth * 2) : this.size; double width = drawSize.width; double height = drawSize.height; @@ -864,54 +861,48 @@ public void drawProfile(DrawContext dc) gl.glTranslated(locationSW.x(), locationSW.y(), locationSW.z()); gl.glScaled(scale, scale, 1d); - if (!dc.isPickingMode()) - { + if (!dc.isPickingMode()) { // Draw grid - Set color using current layer opacity this.drawGrid(dc, drawSize); // Draw profile graph this.drawGraph(dc, drawSize); - if (!isMinimized) - { + if (!isMinimized) { // Draw GUI buttons drawGUI(dc, drawSize); // Draw labels String label = String.format("min %.0fm max %.0fm", this.minElevation, this.maxElevation); - if (this.unit.equals(UNIT_IMPERIAL)) + if (this.unit.equals(UNIT_IMPERIAL)) { label = String.format("min %.0fft max %.0fft", this.minElevation * METER_TO_FEET, - this.maxElevation * METER_TO_FEET); + this.maxElevation * METER_TO_FEET); + } gl.glLoadIdentity(); gl.glDisable(GL.GL_CULL_FACE); drawLabel(dc, label, locationSW.add3(new Vec4(0, -12, 0)), -1); // left aligned - if (this.pickedSample != -1) - { + if (this.pickedSample != -1) { double pickedElevation = positions[this.pickedSample].getElevation(); label = String.format("%.0fm", pickedElevation); - if (this.unit.equals(UNIT_IMPERIAL)) + if (this.unit.equals(UNIT_IMPERIAL)) { label = String.format("%.0fft", pickedElevation * METER_TO_FEET); + } drawLabel(dc, label, locationSW.add3(new Vec4(width, -12, 0)), 1); // right aligned } } - } - else - { + } else { // Picking this.pickSupport.clearPickList(); this.pickSupport.beginPicking(dc); // Draw unique color across the rectangle Color color = dc.getUniquePickColor(); int colorCode = color.getRGB(); - if (!isMinimized) - { + if (!isMinimized) { // Update graph pick point computePickPosition(dc, locationSW, new Dimension((int) (width * scale), (int) (height * scale))); // Draw GUI buttons drawGUI(dc, drawSize); - } - else - { + } else { // Add graph to the pickable list for 'un-minimize' click this.pickSupport.addPickableObject(colorCode, this); gl.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); @@ -927,36 +918,29 @@ public void drawProfile(DrawContext dc) this.pickSupport.endPicking(dc); this.pickSupport.resolvePick(dc, dc.getPickPoint(), this); } - } - catch (Exception e) - { + } catch (Exception e) { //e.printStackTrace(); - } - finally - { - if (projectionPushed) - { + } finally { + if (projectionPushed) { gl.glMatrixMode(GL2.GL_PROJECTION); gl.glPopMatrix(); } - if (modelviewPushed) - { + if (modelviewPushed) { gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glPopMatrix(); } - if (attribsPushed) + if (attribsPushed) { gl.glPopAttrib(); + } } } // Draw grid graphic - - protected void drawGrid(DrawContext dc, Dimension dimension) - { + protected void drawGrid(DrawContext dc, Dimension dimension) { // Background color Color backColor = getBackgroundColor(this.color); drawFilledRectangle(dc, new Vec4(0, 0, 0), dimension, new Color(backColor.getRed(), - backColor.getGreen(), backColor.getBlue(), (int) (backColor.getAlpha() * .5))); // Increased transparency + backColor.getGreen(), backColor.getBlue(), (int) (backColor.getAlpha() * .5))); // Increased transparency // Grid - minimal float[] colorRGB = this.color.getRGBColorComponents(null); GL2 gl = dc.getGL().getGL2(); // GL initialization checks for GL2 compatibility. @@ -967,30 +951,30 @@ protected void drawGrid(DrawContext dc, Dimension dimension) } // Draw profile graphic - - protected void drawGraph(DrawContext dc, Dimension dimension) - { + protected void drawGraph(DrawContext dc, Dimension dimension) { GL2 gl = dc.getGL().getGL2(); // GL initialization checks for GL2 compatibility. // Adjust min/max elevation for the graph double min = this.minElevation; double max = this.maxElevation; - if (this.showEyePosition && this.follow.equals(FOLLOW_EYE)) + if (this.showEyePosition && this.follow.equals(FOLLOW_EYE)) { max = Math.max(max, dc.getView().getEyePosition().getElevation()); + } if (this.showEyePosition && (this.follow.equals(FOLLOW_OBJECT) || this.follow.equals(FOLLOW_PATH)) - && this.objectPosition != null) + && this.objectPosition != null) { max = Math.max(max, this.objectPosition.getElevation()); - if (this.zeroBased) - { - if (min > 0) + } + if (this.zeroBased) { + if (min > 0) { min = 0; - if (max < 0) + } + if (max < 0) { max = 0; + } } int i; double stepX = dimension.getWidth() / this.length; double stepY = dimension.getHeight() / (max - min); - if (this.keepProportions) - { + if (this.keepProportions) { stepX = Math.min(stepX, stepY); //noinspection SuspiciousNameCombination stepY = stepX; @@ -999,10 +983,9 @@ protected void drawGraph(DrawContext dc, Dimension dimension) double x = 0, y; // Filled graph gl.glColor4ub((byte) this.color.getRed(), (byte) this.color.getGreen(), - (byte) this.color.getBlue(), (byte) 100); + (byte) this.color.getBlue(), (byte) 100); gl.glBegin(GL2.GL_TRIANGLE_STRIP); - for (i = 0; i < this.samples; i++) - { + for (i = 0; i < this.samples; i++) { x = i * lengthStep * stepX; y = (this.positions[i].getElevation() - min) * stepY; gl.glVertex3d(x, 0, 0); @@ -1013,8 +996,7 @@ protected void drawGraph(DrawContext dc, Dimension dimension) float[] colorRGB = this.color.getRGBColorComponents(null); gl.glColor4d(colorRGB[0], colorRGB[1], colorRGB[2], this.getOpacity()); gl.glBegin(GL2.GL_LINE_STRIP); - for (i = 0; i < this.samples; i++) - { + for (i = 0; i < this.samples; i++) { x = i * lengthStep * stepX; y = (this.positions[i].getElevation() - min) * stepY; gl.glVertex3d(x, y, 0); @@ -1022,125 +1004,119 @@ protected void drawGraph(DrawContext dc, Dimension dimension) gl.glEnd(); // Middle vertical line gl.glColor4d(colorRGB[0], colorRGB[1], colorRGB[2], this.getOpacity() * .3); // increased transparency here - if (!this.follow.equals(FOLLOW_PATH)) + if (!this.follow.equals(FOLLOW_PATH)) { drawVerticalLine(dc, dimension, x / 2); + } // Eye or object position double eyeX = -1, eyeY = -1; - if ((this.follow.equals(FOLLOW_EYE) || - (this.follow.equals(FOLLOW_OBJECT) && this.objectPosition != null) || - (this.follow.equals(FOLLOW_PATH) && this.objectPosition != null)) - && this.showEyePosition) - { + if ((this.follow.equals(FOLLOW_EYE) + || (this.follow.equals(FOLLOW_OBJECT) && this.objectPosition != null) + || (this.follow.equals(FOLLOW_PATH) && this.objectPosition != null)) + && this.showEyePosition) { eyeX = x / 2; eyeY = (dc.getView().getEyePosition().getElevation() - min) * stepY; - if (this.follow.equals(FOLLOW_PATH)) + if (this.follow.equals(FOLLOW_PATH)) { eyeX = computeObjectSample(this.objectPosition) * lengthStep * stepX; - if (this.follow.equals(FOLLOW_OBJECT) || this.follow.equals(FOLLOW_PATH)) + } + if (this.follow.equals(FOLLOW_OBJECT) || this.follow.equals(FOLLOW_PATH)) { eyeY = (this.objectPosition.getElevation() - min) * stepY; - if (eyeX >= 0 && eyeY >= 0) + } + if (eyeX >= 0 && eyeY >= 0) { this.drawFilledRectangle(dc, new Vec4(eyeX - 2, eyeY - 2, 0), new Dimension(5, 5), this.color); + } // Vertical line at object position when follow path - if (this.follow.equals(FOLLOW_PATH) && eyeX >= 0) + if (this.follow.equals(FOLLOW_PATH) && eyeX >= 0) { drawVerticalLine(dc, dimension, eyeX); + } } // Selected/picked vertical and horizontal lines - if (this.pickedSample != -1) - { + if (this.pickedSample != -1) { double pickedX = this.pickedSample * lengthStep * stepX; double pickedY = (positions[this.pickedSample].getElevation() - min) * stepY; gl.glColor4d(colorRGB[0], colorRGB[1], colorRGB[2] * .5, this.getOpacity() * .8); // yellower color drawVerticalLine(dc, dimension, pickedX); drawHorizontalLine(dc, dimension, pickedY); // Eye or object - picked position line - if (eyeX >= 0 && eyeY >= 0) - { + if (eyeX >= 0 && eyeY >= 0) { // Line drawLine(dc, pickedX, pickedY, eyeX, eyeY); // Distance label double distance = dc.getView().getEyePoint().distanceTo3( - dc.getGlobe().computePointFromPosition(positions[this.pickedSample])); - if (this.follow.equals(FOLLOW_OBJECT) || this.follow.equals(FOLLOW_PATH)) - distance = dc.getGlobe().computePointFromPosition(this.objectPosition).distanceTo3( dc.getGlobe().computePointFromPosition(positions[this.pickedSample])); + if (this.follow.equals(FOLLOW_OBJECT) || this.follow.equals(FOLLOW_PATH)) { + distance = dc.getGlobe().computePointFromPosition(this.objectPosition).distanceTo3( + dc.getGlobe().computePointFromPosition(positions[this.pickedSample])); + } String label = String.format("Dist %.0fm", distance); - if (this.unit.equals(UNIT_IMPERIAL)) + if (this.unit.equals(UNIT_IMPERIAL)) { label = String.format("Dist %.0fft", distance * METER_TO_FEET); + } drawLabel(dc, label, new Vec4(pickedX + 5, pickedY - 12, 0), -1); // left aligned } } // Min elevation horizontal line - if (this.minElevation != min) - { + if (this.minElevation != min) { y = (this.minElevation - min) * stepY; gl.glColor4d(colorRGB[0], colorRGB[1], colorRGB[2], this.getOpacity() * .5); // medium transparency drawHorizontalLine(dc, dimension, y); } // Max elevation horizontal line - if (this.maxElevation != max) - { + if (this.maxElevation != max) { y = (this.maxElevation - min) * stepY; gl.glColor4d(colorRGB[0], colorRGB[1], colorRGB[2], this.getOpacity() * .5); // medium transparency drawHorizontalLine(dc, dimension, y); } // Sea level in between positive elevations only (not across land) - if (min < 0 && max >= 0) - { + if (min < 0 && max >= 0) { gl.glColor4d(colorRGB[0] * .7, colorRGB[1] * .7, colorRGB[2], this.getOpacity() * .5); // bluer color y = -this.minElevation * stepY; double previousX = -1; - for (i = 0; i < this.samples; i++) - { + for (i = 0; i < this.samples; i++) { x = i * lengthStep * stepX; - if (this.positions[i].getElevation() > 0 || i == this.samples - 1) - { - if (previousX >= 0) - { + if (this.positions[i].getElevation() > 0 || i == this.samples - 1) { + if (previousX >= 0) { gl.glBegin(GL2.GL_LINE_STRIP); gl.glVertex3d(previousX, y, 0); gl.glVertex3d(x, y, 0); gl.glEnd(); previousX = -1; } - } - else + } else { previousX = previousX < 0 ? x : previousX; + } } } } - protected void drawGUI(DrawContext dc, Dimension dimension) - { + protected void drawGUI(DrawContext dc, Dimension dimension) { GL2 gl = dc.getGL().getGL2(); // GL initialization checks for GL2 compatibility. int buttonSize = 16; int hs = buttonSize / 2; int buttonBorder = 4; Dimension buttonDimension = new Dimension(buttonSize, buttonSize); Color highlightColor = new Color(color.getRed(), color.getGreen(), - color.getBlue(), (int) (color.getAlpha() * .5)); + color.getBlue(), (int) (color.getAlpha() * .5)); Color backColor = getBackgroundColor(this.color); backColor = new Color(backColor.getRed(), backColor.getGreen(), - backColor.getBlue(), (int) (backColor.getAlpha() * .5)); // Increased transparency + backColor.getBlue(), (int) (backColor.getAlpha() * .5)); // Increased transparency Color drawColor; int y = dimension.height - buttonDimension.height - buttonBorder; int x = dimension.width; Object pickedObject = dc.getPickedObjects() != null ? dc.getPickedObjects().getTopObject() : null; // Maximize button - if (!isMaximized) - { + if (!isMaximized) { x -= buttonDimension.width + buttonBorder; - if (dc.isPickingMode()) - { + if (dc.isPickingMode()) { drawColor = dc.getUniquePickColor(); int colorCode = drawColor.getRGB(); this.pickSupport.addPickableObject(colorCode, this.buttonMaximize, null, false); - } - else + } else { drawColor = this.buttonMaximize == pickedObject ? highlightColor : backColor; + } drawFilledRectangle(dc, new Vec4(x, y, 0), buttonDimension, drawColor); - if (!dc.isPickingMode()) - { + if (!dc.isPickingMode()) { gl.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), - (byte) color.getBlue(), (byte) color.getAlpha()); + (byte) color.getBlue(), (byte) color.getAlpha()); // Draw '+' drawLine(dc, x + 3, y + hs, x + buttonDimension.width - 3, y + hs); // Horizontal line drawLine(dc, x + hs, y + 3, x + hs, y + buttonDimension.height - 3); // Vertical line @@ -1149,39 +1125,34 @@ protected void drawGUI(DrawContext dc, Dimension dimension) // Minimize button x -= buttonDimension.width + buttonBorder; - if (dc.isPickingMode()) - { + if (dc.isPickingMode()) { drawColor = dc.getUniquePickColor(); int colorCode = drawColor.getRGB(); this.pickSupport.addPickableObject(colorCode, this.buttonMinimize, null, false); - } - else + } else { drawColor = this.buttonMinimize == pickedObject ? highlightColor : backColor; + } drawFilledRectangle(dc, new Vec4(x, y, 0), buttonDimension, drawColor); - if (!dc.isPickingMode()) - { + if (!dc.isPickingMode()) { gl.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), - (byte) color.getBlue(), (byte) color.getAlpha()); + (byte) color.getBlue(), (byte) color.getAlpha()); // Draw '-' drawLine(dc, x + 3, y + hs, x + buttonDimension.width - 3, y + hs); // Horizontal line } } - protected void drawHorizontalLine(DrawContext dc, Dimension dimension, double y) - { + protected void drawHorizontalLine(DrawContext dc, Dimension dimension, double y) { drawLine(dc, 0, y, dimension.getWidth(), y); } - protected void drawVerticalLine(DrawContext dc, Dimension dimension, double x) - { + protected void drawVerticalLine(DrawContext dc, Dimension dimension, double x) { drawLine(dc, x, 0, x, dimension.getHeight()); } - protected void drawFilledRectangle(DrawContext dc, Vec4 origin, Dimension dimension, Color color) - { + protected void drawFilledRectangle(DrawContext dc, Vec4 origin, Dimension dimension, Color color) { GL2 gl = dc.getGL().getGL2(); // GL initialization checks for GL2 compatibility. gl.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), - (byte) color.getBlue(), (byte) color.getAlpha()); + (byte) color.getBlue(), (byte) color.getAlpha()); gl.glDisable(GL.GL_TEXTURE_2D); // no textures gl.glBegin(GL2.GL_POLYGON); gl.glVertex3d(origin.x, origin.y, 0); @@ -1192,8 +1163,7 @@ protected void drawFilledRectangle(DrawContext dc, Vec4 origin, Dimension dimens gl.glEnd(); } - protected void drawLine(DrawContext dc, double x1, double y1, double x2, double y2) - { + protected void drawLine(DrawContext dc, double x1, double y1, double x2, double y2) { GL2 gl = dc.getGL().getGL2(); // GL initialization checks for GL2 compatibility. gl.glBegin(GL2.GL_LINE_STRIP); gl.glVertex3d(x1, y1, 0); @@ -1203,18 +1173,18 @@ protected void drawLine(DrawContext dc, double x1, double y1, double x2, double // Draw a text label // Align = -1: left, 0: center and 1: right - - protected void drawLabel(DrawContext dc, String text, Vec4 screenPoint, int align) - { + protected void drawLabel(DrawContext dc, String text, Vec4 screenPoint, int align) { TextRenderer textRenderer = OGLTextRenderer.getOrCreateTextRenderer(dc.getTextRendererCache(), - this.defaultFont); + this.defaultFont); Rectangle2D nameBound = textRenderer.getBounds(text); int x = (int) screenPoint.x(); // left - if (align == 0) + if (align == 0) { x = (int) (screenPoint.x() - nameBound.getWidth() / 2d); // centered - if (align > 0) + } + if (align > 0) { x = (int) (screenPoint.x() - nameBound.getWidth()); // right + } int y = (int) screenPoint.y(); textRenderer.begin3DRendering(); @@ -1228,82 +1198,61 @@ protected void drawLabel(DrawContext dc, String text, Vec4 screenPoint, int alig } // Compute background color for best contrast - - protected Color getBackgroundColor(Color color) - { + protected Color getBackgroundColor(Color color) { float[] compArray = new float[4]; Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), compArray); - if (compArray[2] > 0.5) + if (compArray[2] > 0.5) { return new Color(0, 0, 0, (int) (this.color.getAlpha() * 0.7f)); - else + } else { return new Color(255, 255, 255, (int) (this.color.getAlpha() * 0.7f)); + } } // ** Dimensions and positionning ************************************************************ - - protected double computeScale(java.awt.Rectangle viewport) - { - if (this.resizeBehavior.equals(AVKey.RESIZE_SHRINK_ONLY)) - { - return Math.min(1d, (this.toViewportScale) * viewport.width / this.size.width); - } - else if (this.resizeBehavior.equals(AVKey.RESIZE_STRETCH)) - { - return (this.toViewportScale) * viewport.width / this.size.width; - } - else if (this.resizeBehavior.equals(AVKey.RESIZE_KEEP_FIXED_SIZE)) - { - return 1d; - } - else - { - return 1d; + protected double computeScale(java.awt.Rectangle viewport) { + switch (this.resizeBehavior) { + case AVKey.RESIZE_SHRINK_ONLY: + return Math.min(1d, (this.toViewportScale) * viewport.width / this.size.width); + case AVKey.RESIZE_STRETCH: + return (this.toViewportScale) * viewport.width / this.size.width; + case AVKey.RESIZE_KEEP_FIXED_SIZE: + return 1d; + default: + return 1d; } } - protected Vec4 computeLocation(java.awt.Rectangle viewport, double scale) - { - double scaledWidth = scale * (isMinimized ? MINIMIZED_SIZE : - isMaximized ? viewport.width - this.borderWidth * 2 : this.size.width); - double scaledHeight = scale * (isMinimized ? MINIMIZED_SIZE : - isMaximized ? viewport.height * 2 / 3 - this.borderWidth * 2 : this.size.height); + protected Vec4 computeLocation(java.awt.Rectangle viewport, double scale) { + double scaledWidth = scale * (isMinimized ? MINIMIZED_SIZE + : isMaximized ? viewport.width - this.borderWidth * 2 : this.size.width); + double scaledHeight = scale * (isMinimized ? MINIMIZED_SIZE + : isMaximized ? viewport.height * 2 / 3 - this.borderWidth * 2 : this.size.height); double x; double y; - if (this.locationCenter != null) - { + if (this.locationCenter != null) { x = this.locationCenter.x - scaledWidth / 2; y = this.locationCenter.y - scaledHeight / 2; - } - else if (this.position.equals(AVKey.NORTHEAST)) - { + } else if (this.position.equals(AVKey.NORTHEAST)) { x = viewport.getWidth() - scaledWidth - this.borderWidth; y = viewport.getHeight() - scaledHeight - this.borderWidth; - } - else if (this.position.equals(AVKey.SOUTHEAST)) - { + } else if (this.position.equals(AVKey.SOUTHEAST)) { x = viewport.getWidth() - scaledWidth - this.borderWidth; y = 0d + this.borderWidth; - } - else if (this.position.equals(AVKey.NORTHWEST)) - { + } else if (this.position.equals(AVKey.NORTHWEST)) { x = 0d + this.borderWidth; y = viewport.getHeight() - scaledHeight - this.borderWidth; - } - else if (this.position.equals(AVKey.SOUTHWEST)) - { + } else if (this.position.equals(AVKey.SOUTHWEST)) { x = 0d + this.borderWidth; y = 0d + this.borderWidth; - } - else // use North East + } else // use North East { x = viewport.getWidth() - scaledWidth / 2 - this.borderWidth; y = viewport.getHeight() - scaledHeight / 2 - this.borderWidth; } - if (this.locationOffset != null) - { + if (this.locationOffset != null) { x += this.locationOffset.x; y += this.locationOffset.y; } @@ -1314,47 +1263,44 @@ else if (this.position.equals(AVKey.SOUTHWEST)) /** * Computes the Position of the pickPoint over the graph and updates pickedSample indice * - * @param dc the current DrawContext + * @param dc the current DrawContext * @param locationSW the screen location of the bottom left corner of the graph - * @param mapSize the graph screen dimension in pixels + * @param mapSize the graph screen dimension in pixels * * @return the picked Position */ - protected Position computePickPosition(DrawContext dc, Vec4 locationSW, Dimension mapSize) - { + protected Position computePickPosition(DrawContext dc, Vec4 locationSW, Dimension mapSize) { Position pickPosition = null; this.pickedSample = -1; Point pickPoint = dc.getPickPoint(); - if (pickPoint != null && this.positions != null && !this.follow.equals(FOLLOW_CURSOR)) - { + if (pickPoint != null && this.positions != null && !this.follow.equals(FOLLOW_CURSOR)) { Rectangle viewport = dc.getView().getViewport(); // Check if pickpoint is inside the graph if (pickPoint.getX() >= locationSW.getX() - && pickPoint.getX() < locationSW.getX() + mapSize.width - && viewport.height - pickPoint.getY() >= locationSW.getY() - && viewport.height - pickPoint.getY() < locationSW.getY() + mapSize.height) - { + && pickPoint.getX() < locationSW.getX() + mapSize.width + && viewport.height - pickPoint.getY() >= locationSW.getY() + && viewport.height - pickPoint.getY() < locationSW.getY() + mapSize.height) { // Find sample - Note: only works when graph expends over the full width int sample = (int) (((double) (pickPoint.getX() - locationSW.getX()) / mapSize.width) * this.samples); - if (sample >= 0 && sample < this.samples) - { + if (sample >= 0 && sample < this.samples) { pickPosition = this.positions[sample]; this.pickedSample = sample; - // Update polyline indicator - ArrayList posList = new ArrayList(); + // Update path indicator + ArrayList posList = new ArrayList<>(); posList.add(positions[sample]); posList.add(new Position(positions[sample].getLatitude(), positions[sample].getLongitude(), - positions[sample].getElevation() + this.length / 10)); - if (this.pickedShape == null) - { - this.pickedShape = new Polyline(posList); - this.pickedShape.setPathType(Polyline.LINEAR); - this.pickedShape.setLineWidth(2); - this.pickedShape.setColor(new Color(this.color.getRed(), - this.color.getGreen(), (int) (this.color.getBlue() * .8), (int) (255 * .8))); - } - else + positions[sample].getElevation() + this.length / 10)); + if (this.pickedShape == null) { + this.pickedShape = new Path(posList); + this.pickedShape.setPathType(AVKey.LINEAR); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineWidth(2); + attrs.setOutlineMaterial(new Material(new Color(this.color.getRed(), + this.color.getGreen(), (int) (this.color.getBlue() * .8), (int) (255 * .8)))); + this.pickedShape.setAttributes(attrs); + } else { this.pickedShape.setPositions(posList); + } } } } @@ -1368,18 +1314,17 @@ protected Position computePickPosition(DrawContext dc, Vec4 locationSW, Dimensio * * @return the sample number or -1 if not found. */ - protected int computeObjectSample(LatLon pos) - { - if (this.pathPositions.size() < 2) + protected int computeObjectSample(LatLon pos) { + if (this.pathPositions.size() < 2) { return -1; + } double radius = this.wwd.getModel().getGlobe().getRadius(); double maxDistanceFromPath = 1000; // meters double distanceFromStart = 0; int segmentIndex = 0; LatLon pos1 = this.pathPositions.get(segmentIndex); - for (int i = 1; i < this.pathPositions.size(); i++) - { + for (int i = 1; i < this.pathPositions.size(); i++) { LatLon pos2 = this.pathPositions.get(i); double segmentLength = LatLon.greatCircleDistance(pos1, pos2).radians * radius; // Check wether the position is close to the segment line @@ -1387,22 +1332,20 @@ protected int computeObjectSample(LatLon pos) Vec4 v1 = new Vec4(pos1.getLatitude().radians, pos1.getLongitude().radians, 0, 0); Vec4 v2 = new Vec4(pos2.getLatitude().radians, pos2.getLongitude().radians, 0, 0); Line line = new Line(v1, v2.subtract3(v1)); - if (line.distanceTo(v0) * radius <= maxDistanceFromPath) - { + if (line.distanceTo(v0) * radius <= maxDistanceFromPath) { // Check whether the position is inside the segment double length1 = LatLon.greatCircleDistance(pos1, pos).radians * radius; double length2 = LatLon.greatCircleDistance(pos2, pos).radians * radius; - if (length1 <= segmentLength && length2 <= segmentLength) - { + if (length1 <= segmentLength && length2 <= segmentLength) { // Compute portion of segment length distanceFromStart += length1 / (length1 + length2) * segmentLength; break; - } - else + } else { distanceFromStart += segmentLength; - } - else + } + } else { distanceFromStart += segmentLength; + } // Next segment pos1 = pos2; } @@ -1411,64 +1354,51 @@ protected int computeObjectSample(LatLon pos) } // ** Position listener impl. ************************************************************ - - public void moved(PositionEvent event) - { + @Override + public void moved(PositionEvent event) { this.positions = null; } // ** Select listener impl. ************************************************************ - - public void selected(SelectEvent event) - { - if (event.hasObjects() && event.getEventAction().equals(SelectEvent.LEFT_CLICK)) - { - if (event.getMouseEvent() != null && event.getMouseEvent().isConsumed()) + @Override + public void selected(SelectEvent event) { + if (event.hasObjects() && event.getEventAction().equals(SelectEvent.LEFT_CLICK)) { + if (event.getMouseEvent() != null && event.getMouseEvent().isConsumed()) { return; + } Object o = event.getTopObject(); - if (o == this.buttonMinimize) - { - if (this.isMaximized) + if (o == this.buttonMinimize) { + if (this.isMaximized) { this.setIsMaximized(false); - else + } else { this.setIsMinimized(true); - } - - else if (o == this.buttonMaximize) - { + } + } else if (o == this.buttonMaximize) { this.setIsMaximized(true); - } - - else if (o == this && this.isMinimized) - { + } else if (o == this && this.isMinimized) { this.setIsMinimized(false); } } } // ** Property change listener *********************************************************** - - public void propertyChange(PropertyChangeEvent propertyChangeEvent) - { + @Override + public void propertyChange(PropertyChangeEvent propertyChangeEvent) { this.positions = null; } // Sets the wwd local reference and add us to the position listeners // the view and elevation model property change listener - - public void setEventSource(WorldWindow wwd) - { - if (this.wwd != null) - { + public void setEventSource(WorldWindow wwd) { + if (this.wwd != null) { this.wwd.removePositionListener(this); this.wwd.getView().removePropertyChangeListener(this); // this.wwd.getModel().getGlobe().getElevationModel().removePropertyChangeListener(this); this.wwd.removeSelectListener(this); } this.wwd = wwd; - if (this.wwd != null) - { + if (this.wwd != null) { this.wwd.addPositionListener(this); this.wwd.getView().addPropertyChangeListener(this); // this.wwd.getModel().getGlobe().getElevationModel().addPropertyChangeListener(this); @@ -1477,139 +1407,132 @@ public void setEventSource(WorldWindow wwd) } // ** Profile data collection ************************************************************ - /** - * Compute the terrain profile.

        If {@link #FOLLOW_VIEW}, {@link #FOLLOW_EYE}, {@link #FOLLOW_CURSOR} or {@link + * Compute the terrain profile. + *

        + * If {@link #FOLLOW_VIEW}, {@link #FOLLOW_EYE}, {@link #FOLLOW_CURSOR} or {@link * #FOLLOW_OBJECT}, collects terrain profile data along a great circle line centered at the current position (view, - * eye, cursor or object) and perpendicular to the view heading - or object heading if {@link #FOLLOW_OBJECT}.

        - * If {@link #FOLLOW_NONE} the profile is computed in between start and end latlon.

        If {@link #FOLLOW_PATH} the - * profile is computed along the path provided with {@link #setPathPositions(ArrayList)}

        + * eye, cursor or object) and perpendicular to the view heading - or object heading if {@link #FOLLOW_OBJECT}. + *

        + * If {@link #FOLLOW_NONE} the profile is computed in between start and end latlon. + *

        + * If {@link #FOLLOW_PATH} the profile is computed along the path provided with + * {@link #setPathPositions(ArrayList)}

        * * @param dc the current DrawContext */ - protected void computeProfile(DrawContext dc) - { - if (this.wwd == null) + protected void computeProfile(DrawContext dc) { + if (this.wwd == null) { return; + } - try - { + try { // Find center position View view = this.wwd.getView(); Position groundPos = null; - if (this.follow.equals(FOLLOW_VIEW)) - groundPos = this.computeViewCenterPosition(dc); - else if (this.follow.equals(FOLLOW_CURSOR)) - groundPos = this.computeCursorPosition(dc); - else if (this.follow.equals(FOLLOW_EYE)) - groundPos = view.getEyePosition(); - else if (this.follow.equals(FOLLOW_OBJECT)) - groundPos = this.objectPosition; + switch (this.follow) { + case FOLLOW_VIEW: + groundPos = this.computeViewCenterPosition(dc); + break; + case FOLLOW_CURSOR: + groundPos = this.computeCursorPosition(dc); + break; + case FOLLOW_EYE: + groundPos = view.getEyePosition(); + break; + case FOLLOW_OBJECT: + groundPos = this.objectPosition; + break; + default: + break; + } // Compute profile if we can - if ((this.follow.equals(FOLLOW_VIEW) && groundPos != null) || - (this.follow.equals(FOLLOW_EYE) && groundPos != null) || - (this.follow.equals(FOLLOW_CURSOR) && groundPos != null) || - (this.follow.equals(FOLLOW_NONE) && this.startLatLon != null && this.endLatLon != null) || - (this.follow.equals(FOLLOW_OBJECT) && this.objectPosition != null && this.objectHeading != null) || - (this.follow.equals(FOLLOW_PATH) && this.pathPositions != null && this.pathPositions.size() >= 2)) - { + if ((this.follow.equals(FOLLOW_VIEW) && groundPos != null) + || (this.follow.equals(FOLLOW_EYE) && groundPos != null) + || (this.follow.equals(FOLLOW_CURSOR) && groundPos != null) + || (this.follow.equals(FOLLOW_NONE) && this.startLatLon != null && this.endLatLon != null) + || (this.follow.equals(FOLLOW_OBJECT) && this.objectPosition != null && this.objectHeading != null) + || (this.follow.equals(FOLLOW_PATH) && this.pathPositions != null && this.pathPositions.size() >= 2)) { this.positions = new Position[samples]; this.minElevation = Double.MAX_VALUE; this.maxElevation = -Double.MAX_VALUE; // Compute profile positions - if (this.follow.equals(FOLLOW_PATH)) - { + if (this.follow.equals(FOLLOW_PATH)) { computePathPositions(); - } - else - { + } else { computeMirroredPositions(groundPos); } // Update shape on ground - if (this.selectionShape == null) - { - this.selectionShape = new Polyline(Arrays.asList(this.positions)); - this.selectionShape.setLineWidth(2); - this.selectionShape.setFollowTerrain(true); - this.selectionShape.setColor(new Color(this.color.getRed(), - this.color.getGreen(), (int) (this.color.getBlue() * .5), (int) (255 * .8))); - } - else + if (this.selectionShape == null) { + this.selectionShape = new Path(Arrays.asList(this.positions)); + this.selectionShape.setSurfacePath(true); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineWidth(2); + attrs.setOutlineMaterial(new Material(new Color(this.color.getRed(), + this.color.getGreen(), (int) (this.color.getBlue() * .5), (int) (255 * .8)))); + this.selectionShape.setAttributes(attrs); + } else { this.selectionShape.setPositions(Arrays.asList(this.positions)); - } - else - { + } + } else { // Off globe or something missing this.positions = null; } - } - catch (Exception e) - { + } catch (Exception e) { this.positions = null; } } - protected Position computeViewCenterPosition(DrawContext dc) - { + protected Position computeViewCenterPosition(DrawContext dc) { View view = dc.getView(); Line ray = view.computeRayFromScreenPoint(view.getViewport().getWidth() / 2, - view.getViewport().getHeight() / 2); + view.getViewport().getHeight() / 2); Intersection[] inters = dc.getSurfaceGeometry().intersect(ray); - if (inters.length > 0) + if (inters.length > 0) { return dc.getGlobe().computePositionFromPoint(inters[0].getIntersectionPoint()); + } return null; } - protected void computeMirroredPositions(LatLon centerLatLon) - { + protected void computeMirroredPositions(LatLon centerLatLon) { View view = this.wwd.getView(); // Compute profile length - if (view instanceof OrbitView) - { + if (view instanceof OrbitView) { this.length = Math.min(((OrbitView) view).getZoom() * .8 * this.profileLengthFactor, - this.wwd.getModel().getGlobe().getRadius() * Math.PI); - } - else - { + this.wwd.getModel().getGlobe().getRadius() * Math.PI); + } else { this.length = Math.min(Math.abs(view.getEyePosition().getElevation()) * .8 * this.profileLengthFactor, - this.wwd.getModel().getGlobe().getRadius() * Math.PI); + this.wwd.getModel().getGlobe().getRadius() * Math.PI); } - if (this.follow.equals(FOLLOW_NONE)) - { + if (this.follow.equals(FOLLOW_NONE)) { this.length = LatLon.greatCircleDistance(this.startLatLon, this.endLatLon).radians - * this.wwd.getModel().getGlobe().getRadius(); - } - else if (this.follow.equals(FOLLOW_OBJECT)) - { + * this.wwd.getModel().getGlobe().getRadius(); + } else if (this.follow.equals(FOLLOW_OBJECT)) { this.length = Math.min(Math.abs(this.objectPosition.getElevation()) * .8 * this.profileLengthFactor, - this.wwd.getModel().getGlobe().getRadius() * Math.PI); + this.wwd.getModel().getGlobe().getRadius() * Math.PI); } double lengthRadian = this.length / this.wwd.getModel().getGlobe().getRadius(); // Iterate on both sides of the center point int i; double step = lengthRadian / (samples - 1); - for (i = 0; i < this.samples; i++) - { + for (i = 0; i < this.samples; i++) { LatLon latLon = null; - if (!this.follow.equals(FOLLOW_NONE)) - { + if (!this.follow.equals(FOLLOW_NONE)) { // Compute segments perpendicular to view or object heading double azimuth = view.getHeading().subtract(Angle.POS90).radians; - if (this.follow.equals(FOLLOW_OBJECT)) + if (this.follow.equals(FOLLOW_OBJECT)) { azimuth = this.objectHeading.subtract(Angle.POS90).radians; - if (i > (float) (this.samples - 1) / 2f) - { + } + if (i > (float) (this.samples - 1) / 2f) { //azimuth = view.getHeading().subtract(Angle.NEG90).radians; azimuth += Math.PI; } double distance = Math.abs(((double) i - ((double) (this.samples - 1) / 2d)) * step); latLon = LatLon.greatCircleEndPosition(centerLatLon, azimuth, distance); - } - else if (this.follow.equals(FOLLOW_NONE) && this.startLatLon != null - && this.endLatLon != null) - { + } else if (this.follow.equals(FOLLOW_NONE) && this.startLatLon != null + && this.endLatLon != null) { // Compute segments between start and end positions latlon latLon = LatLon.interpolate((double) i / (this.samples - 1), this.startLatLon, this.endLatLon); } @@ -1617,8 +1540,7 @@ else if (this.follow.equals(FOLLOW_NONE) && this.startLatLon != null } } - protected void computePathPositions() - { + protected void computePathPositions() { this.length = computePathLength(); double lengthRadians = this.length / this.wwd.getModel().getGlobe().getRadius(); double step = lengthRadians / (this.samples - 1); @@ -1628,33 +1550,26 @@ protected void computePathPositions() this.setPosition(0, latLon); // Compute in between samples double distance, azimuth; - for (int i = 1; i < this.samples - 1; i++) - { + for (int i = 1; i < this.samples - 1; i++) { double stepToGo = step; - while (stepToGo > 0) - { - if (this.pathType == Polyline.RHUMB_LINE) + while (stepToGo > 0) { + if (this.pathType.equals(AVKey.RHUMB_LINE)) { distance = LatLon.rhumbDistance(latLon, this.pathPositions.get(segmentIndex + 1)).radians; - else + } else { distance = LatLon.greatCircleDistance(latLon, this.pathPositions.get(segmentIndex + 1)).radians; - if (distance >= stepToGo) - { - if (this.pathType == Polyline.RHUMB_LINE) - { + } + if (distance >= stepToGo) { + if (this.pathType.equals(AVKey.RHUMB_LINE)) { azimuth = LatLon.rhumbAzimuth(latLon, this.pathPositions.get(segmentIndex + 1)).radians; latLon = LatLon.rhumbEndPosition(latLon, azimuth, stepToGo); - } - else - { + } else { azimuth = LatLon.greatCircleAzimuth(latLon, this.pathPositions.get(segmentIndex + 1)).radians; latLon = LatLon.greatCircleEndPosition(latLon, azimuth, stepToGo); } this.setPosition(i, latLon); stepToGo = 0; - } - else - { + } else { segmentIndex++; latLon = this.pathPositions.get(segmentIndex); stepToGo -= distance; @@ -1665,42 +1580,38 @@ protected void computePathPositions() this.setPosition(this.samples - 1, this.pathPositions.get(this.pathPositions.size() - 1)); } - protected double computePathLength() - { + protected double computePathLength() { double pathLengthRadians = 0; LatLon pos1 = null; - for (LatLon pos2 : this.pathPositions) - { - if (pos1 != null) + for (LatLon pos2 : this.pathPositions) { + if (pos1 != null) { pathLengthRadians += LatLon.greatCircleDistance(pos1, pos2).radians; + } pos1 = pos2; } return pathLengthRadians * this.wwd.getModel().getGlobe().getRadius(); } - protected void setPosition(int index, LatLon latLon) - { - Double elevation = - this.wwd.getModel().getGlobe().getElevation(latLon.getLatitude(), latLon.getLongitude()); + protected void setPosition(int index, LatLon latLon) { + Double elevation + = this.wwd.getModel().getGlobe().getElevation(latLon.getLatitude(), latLon.getLongitude()); this.minElevation = elevation < this.minElevation ? elevation : this.minElevation; this.maxElevation = elevation > this.maxElevation ? elevation : this.maxElevation; // Add position to the list positions[index] = new Position(latLon, elevation); } - protected Position computeCursorPosition(DrawContext dc) - { + protected Position computeCursorPosition(DrawContext dc) { Position pos = this.wwd.getCurrentPosition(); - if (pos == null && dc.getPickPoint() != null) - { + if (pos == null && dc.getPickPoint() != null) { // Current pos is null, try intersection with terrain geometry Line ray = dc.getView().computeRayFromScreenPoint(dc.getPickPoint().x, dc.getPickPoint().y); Intersection[] inter = dc.getSurfaceGeometry().intersect(ray); - if (inter != null && inter.length > 0) + if (inter != null && inter.length > 0) { pos = dc.getGlobe().computePositionFromPoint(inter[0].getIntersectionPoint()); + } } - if (pos == null && dc.getPickPoint() != null) - { + if (pos == null && dc.getPickPoint() != null) { // Position is still null, fallback on intersection with ellipsoid. pos = dc.getView().computePositionFromScreenPoint(dc.getPickPoint().x, dc.getPickPoint().y); } @@ -1708,8 +1619,7 @@ protected Position computeCursorPosition(DrawContext dc) } @Override - public String toString() - { + public String toString() { return Logging.getMessage("layers.Earth.TerrainProfileLayer.Name"); } } diff --git a/src/gov/nasa/worldwind/layers/TextureTile.java b/src/gov/nasa/worldwind/layers/TextureTile.java index 43cbe2adda..0da296d2fa 100644 --- a/src/gov/nasa/worldwind/layers/TextureTile.java +++ b/src/gov/nasa/worldwind/layers/TextureTile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -14,14 +36,14 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.util.*; import java.util.concurrent.atomic.AtomicLong; /** * This class manages the conversion and timing of image data to a JOGL Texture, and provides an interface for binding * the texture and applying any texture transforms to align the texture and texture coordinates. - *

        + *

        * * @author tag * @version $Id: TextureTile.java 1171 2013-02-11 21:45:02Z dcollins $ @@ -102,7 +124,7 @@ public void setFallbackTile(TextureTile fallbackTile) /** * Returns the texture data most recently specified for the tile. New texture data is typically specified when a new * image is read, either initially or in response to image expiration. - *

        + *

        * If texture data is non-null, a new texture is created from the texture data when the tile is next bound or * otherwise initialized. The texture data field is then set to null. Subsequently setting texture data to be * non-null causes a new texture to be created when the tile is next bound or initialized. @@ -117,11 +139,11 @@ public TextureData getTextureData() /** * Specifies new texture data for the tile. New texture data is typically specified when a new image is read, either * initially or in response to image expiration. - *

        + *

        * If texture data is non-null, a new texture is created from the texture data when the tile is next bound or * otherwise initialized. The texture data field is then set to null. Subsequently setting texture data to be * non-null causes a new texture to be created when the tile is next bound or initialized. - *

        + *

        * When a texture is created from the texture data, the texture data field is set to null to indicate that the data * has been converted to a texture and its resources may be released. * diff --git a/src/gov/nasa/worldwind/layers/TiledImageLayer.java b/src/gov/nasa/worldwind/layers/TiledImageLayer.java index ccdfb549eb..67fba48604 100644 --- a/src/gov/nasa/worldwind/layers/TiledImageLayer.java +++ b/src/gov/nasa/worldwind/layers/TiledImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -16,7 +38,7 @@ import org.w3c.dom.*; import javax.imageio.ImageIO; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.xml.xpath.XPath; import java.awt.image.*; import java.io.*; @@ -168,7 +190,7 @@ public double getDetailHint() * Values greater than 0 cause imagery to appear at higher resolution at greater altitudes than normal, but at an * increased performance cost. Values less than 0 decrease the default resolution at any given altitude. The default * value is 0. Values typically range between -0.5 and 0.5. - *

        + *

        * Note: The resolution-to-height relationship is defined by a scale factor that specifies the approximate size of * discernible lengths in the image relative to eye distance. The scale is specified as a power of 10. A value of 3, * for example, specifies that 1 meter on the surface should be distinguishable from an altitude of 10^3 meters @@ -291,7 +313,7 @@ protected void createTopLevelTiles() Angle latOrigin = this.levels.getTileOrigin().getLatitude(); Angle lonOrigin = this.levels.getTileOrigin().getLongitude(); - // Determine the row and column offset from the common World Wind global tiling origin. + // Determine the row and column offset from the common WorldWind global tiling origin. int firstRow = Tile.computeRow(dLat, sector.getMinLatitude(), latOrigin); int firstCol = Tile.computeColumn(dLon, sector.getMinLongitude(), lonOrigin); int lastRow = Tile.computeRow(dLat, sector.getMaxLatitude(), latOrigin); @@ -670,7 +692,7 @@ protected void checkTextureExpiration(DrawContext dc, List tiles) protected void setBlendingFunction(DrawContext dc) { // Set up a premultiplied-alpha blending function. Any texture read by JOGL will have alpha-premultiplied color - // components, as will any DDS file created by World Wind or the World Wind WMS. We'll also set up the base + // components, as will any DDS file created by WorldWind or the WorldWind WMS. We'll also set up the base // color as a premultiplied color, so that any incoming premultiplied color will be properly combined with the // base color. @@ -827,7 +849,8 @@ public static Document createTiledImageLayerConfigDocument(AVList params) /** * Appends TiledImageLayer configuration parameters as elements to the specified context. This appends elements for - * the following parameters:
        ParameterElement PathType
        {@link + * the following parameters: + * @@ -937,7 +960,8 @@ public static Element createTiledImageLayerConfigElements(AVList params, Element /** * Parses TiledImageLayer configuration parameters from the specified DOM document. This writes output as key-value * pairs to params. If a parameter from the XML document already exists in params, that parameter is ignored. - * Supported key and parameter names are:
        Parameters
        ParameterElement PathType
        {@link * AVKey#SERVICE_NAME}Service/@serviceNameString
        {@link * AVKey#IMAGE_FORMAT}ImageFormatString
        {@link * AVKey#AVAILABLE_IMAGE_FORMATS}AvailableImageFormats/ImageFormatString array
        + * Supported key and parameter names are:
        ParameterElement PathType
        + * * @@ -1022,7 +1046,8 @@ public static AVList getTiledImageLayerConfigParams(Element domElement, AVList p /** * Parses TiledImageLayer configuration parameters from previous versions of configuration documents. This writes * output as key-value pairs to params. If a parameter from the XML document already exists in params, that - * parameter is ignored. Supported key and parameter names are:
        Supported Names
        ParameterElement PathType
        {@link AVKey#SERVICE_NAME}Service/@serviceNameString
        {@link * AVKey#IMAGE_FORMAT}ImageFormatString
        {@link * AVKey#AVAILABLE_IMAGE_FORMATS}AvailableImageFormats/ImageFormatString array
        ParameterElement + * parameter is ignored. Supported key and parameter names are: + *
        Supported Names
        ParameterElement * PathType
        {@link AVKey#TEXTURE_FORMAT}CompressTextures"image/dds" if * CompressTextures is "true"; null otherwise
        * @@ -1242,9 +1267,9 @@ public int computeLevelForResolution(Sector sector, double resolution) } /** - * Create an image for the portion of this layer lying within a specified sector. The image is created at a - * specified aspect ratio within a canvas of a specified size. This returns the specified image if this layer has no - * content in the specified sector. + * Create an image for the portion of this layer lying within a specified sector.The image is created at a + specified aspect ratio within a canvas of a specified size. This returns the specified image if this layer has no + content in the specified sector. * * @param sector the sector of interest. * @param canvasWidth the width of the canvas. @@ -1270,6 +1295,7 @@ public int computeLevelForResolution(Sector sector, double resolution) * non-null, that buffered image is returned. * * @throws IllegalArgumentException if sector is null. + * @throws java.lang.Exception Other errors. * @see ImageUtil#mergeImage(gov.nasa.worldwind.geom.Sector, gov.nasa.worldwind.geom.Sector, double, * java.awt.image.BufferedImage, java.awt.image.BufferedImage) ; */ diff --git a/src/gov/nasa/worldwind/layers/ViewControlsLayer.java b/src/gov/nasa/worldwind/layers/ViewControlsLayer.java index 68eac880f2..53d82484e2 100644 --- a/src/gov/nasa/worldwind/layers/ViewControlsLayer.java +++ b/src/gov/nasa/worldwind/layers/ViewControlsLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -15,10 +37,10 @@ /** * This layer displays onscreen view controls. Controls are available for pan, zoom, heading, pitch, tilt, field-of-view * and vertical exaggeration. Each of the controls can be enabled or disabled independently. - *

        + *

        * An instance of this class depends on an instance of {@link ViewControlsSelectListener} to control it. The select * listener must be registered as such via {@link gov.nasa.worldwind.WorldWindow#addSelectListener(gov.nasa.worldwind.event.SelectListener)}. - *

        + *

        * ViewControlsLayer instances are not sharable among WorldWindows. * * @author Patrick Murris diff --git a/src/gov/nasa/worldwind/layers/ViewControlsSelectListener.java b/src/gov/nasa/worldwind/layers/ViewControlsSelectListener.java index fdd3d13802..35b79f478e 100644 --- a/src/gov/nasa/worldwind/layers/ViewControlsSelectListener.java +++ b/src/gov/nasa/worldwind/layers/ViewControlsSelectListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -45,8 +67,8 @@ public class ViewControlsSelectListener implements SelectListener protected double veStep = 0.1; /** - * Construct a controller for specified WorldWindow and ViewControlsLayer. - *

        + * Construct a controller for specified WorldWindow and ViewControlsLayer. + *

        * ViewControlLayers are not sharable among WorldWindows. A separate layer and controller * must be established for each window that's to have view controls. * @@ -88,7 +110,7 @@ public void actionPerformed(ActionEvent event) * * @param delay the repeat timer delay in milliseconds. * - * @throws IllegalArgumentException + * @throws IllegalArgumentException if delay is less than or equal to zero. */ public void setRepeatTimerDelay(int delay) { @@ -180,7 +202,7 @@ public double getHeadingIncrement() * * @param value the pitch increment value in decimal degrees. * - * @throws IllegalArgumentException + * @throws IllegalArgumentException if value is < zero. */ public void setPitchIncrement(double value) { @@ -209,7 +231,7 @@ public double getPitchIncrement() * * @param value the field of view increment factor. * - * @throws IllegalArgumentException + * @throws IllegalArgumentException if value < 1; */ public void setFovIncrement(double value) { @@ -238,7 +260,7 @@ public double getFovIncrement() * * @param value the vertical exaggeration increment. * - * @throws IllegalArgumentException + * @throws IllegalArgumentException if value < 0. */ public void setVeIncrement(double value) { diff --git a/src/gov/nasa/worldwind/layers/WorldMapLayer.java b/src/gov/nasa/worldwind/layers/WorldMapLayer.java index d9c1ba0f72..5d8c84f534 100644 --- a/src/gov/nasa/worldwind/layers/WorldMapLayer.java +++ b/src/gov/nasa/worldwind/layers/WorldMapLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers; @@ -14,18 +36,18 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.io.*; import java.util.ArrayList; /** * Displays a world map overlay with a current-position crosshair in a screen corner. - *

        + *

        * A {@link gov.nasa.worldwindx.examples.ClickAndGoSelectListener} can be used in conjunction with this layer to move * the view to a selected location when that location is clicked within the layer's map. Specify * WorldMapLayer.class when constructing the ClickAndGoSelectListener. - *

        + *

        * Note: This layer may not be shared among multiple {@link WorldWindow}s. * * @author Patrick Murris @@ -178,7 +200,7 @@ public String getResizeBehavior() /** * Sets the behavior the layer uses to size the world map icon when the viewport size changes, typically when the - * World Wind window is resized. If the value is AVKey.RESIZE_KEEP_FIXED_SIZE, the icon size is kept to the size + * WorldWind window is resized. If the value is AVKey.RESIZE_KEEP_FIXED_SIZE, the icon size is kept to the size * specified in its image file scaled by the layer's current icon scale. If the value is AVKey.RESIZE_STRETCH, the * icon is resized to have a constant size relative to the current viewport size. If the viewport shrinks the icon * size decreases; if it expands then the icon file enlarges. The relative size is determined by the current world diff --git a/src/gov/nasa/worldwind/layers/mercator/BasicMercatorTiledImageLayer.java b/src/gov/nasa/worldwind/layers/mercator/BasicMercatorTiledImageLayer.java index 62a045f6b0..9778b9cef4 100644 --- a/src/gov/nasa/worldwind/layers/mercator/BasicMercatorTiledImageLayer.java +++ b/src/gov/nasa/worldwind/layers/mercator/BasicMercatorTiledImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.mercator; diff --git a/src/gov/nasa/worldwind/layers/mercator/MercatorSector.java b/src/gov/nasa/worldwind/layers/mercator/MercatorSector.java index 60c4f23457..a2ca131ec7 100644 --- a/src/gov/nasa/worldwind/layers/mercator/MercatorSector.java +++ b/src/gov/nasa/worldwind/layers/mercator/MercatorSector.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.mercator; diff --git a/src/gov/nasa/worldwind/layers/mercator/MercatorTextureTile.java b/src/gov/nasa/worldwind/layers/mercator/MercatorTextureTile.java index 8f8a8fd562..aa10ea0465 100644 --- a/src/gov/nasa/worldwind/layers/mercator/MercatorTextureTile.java +++ b/src/gov/nasa/worldwind/layers/mercator/MercatorTextureTile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.mercator; diff --git a/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java b/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java index f32d2dab70..9ba7c0ff76 100644 --- a/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java +++ b/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.mercator; @@ -15,7 +37,7 @@ import gov.nasa.worldwind.util.*; import javax.imageio.ImageIO; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.awt.geom.*; import java.awt.image.*; @@ -201,7 +223,7 @@ private void createTopLevelTiles() Angle latOrigin = this.levels.getTileOrigin().getLatitude(); Angle lonOrigin = this.levels.getTileOrigin().getLongitude(); - // Determine the row and column offset from the common World Wind global tiling origin. + // Determine the row and column offset from the common WorldWind global tiling origin. int firstRow = Tile.computeRow(dLat, sector.getMinLatitude(), latOrigin); int firstCol = Tile.computeColumn(dLon, sector.getMinLongitude(), lonOrigin); int lastRow = Tile.computeRow(dLat, sector.getMaxLatitude(), latOrigin); diff --git a/src/gov/nasa/worldwind/layers/placename/PlaceNameLayer.java b/src/gov/nasa/worldwind/layers/placename/PlaceNameLayer.java index b42319d090..44f6591d9b 100644 --- a/src/gov/nasa/worldwind/layers/placename/PlaceNameLayer.java +++ b/src/gov/nasa/worldwind/layers/placename/PlaceNameLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.placename; @@ -105,6 +127,7 @@ public PlaceNameLayer(PlaceNameServiceSet placeNameServiceSet) * * @deprecated This flag no longer has any effect. Placenames participate in global decluttering. */ + @Deprecated public boolean isCullNames() { return cullNames; @@ -115,6 +138,7 @@ public boolean isCullNames() * * @deprecated This flag no longer has any effect. Placenames participate in global decluttering. */ + @Deprecated public void setCullNames(boolean cullNames) { this.cullNames = cullNames; @@ -1229,11 +1253,11 @@ protected ByteBuffer handleXMLContent() throws IOException /** * Start a new {@link BulkRetrievalThread} that downloads all placenames for a given sector and resolution to the - * current World Wind file cache. - *

        + * current WorldWind file cache. + *

        * This method creates and starts a thread to perform the download. A reference to the thread is returned. To create * a downloader that has not been started, construct a {@link PlaceNameLayerBulkDownloader}. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * @@ -1258,16 +1282,16 @@ public BulkRetrievalThread makeLocal(Sector sector, double resolution, BulkRetri /** * Start a new {@link BulkRetrievalThread} that downloads all placenames for a given sector and resolution to a * specified file store. - *

        + *

        * This method creates and starts a thread to perform the download. A reference to the thread is returned. To create * a downloader that has not been started, construct a {@link PlaceNameLayerBulkDownloader}. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * * @param sector the sector to download data for. * @param resolution the target resolution, provided in radians of latitude per texel. - * @param fileStore the file store in which to place the downloaded elevations. If null the current World Wind file + * @param fileStore the file store in which to place the downloaded elevations. If null the current WorldWind file * cache is used. * @param listener an optional retrieval listener. May be null. * @@ -1287,9 +1311,9 @@ public BulkRetrievalThread makeLocal(Sector sector, double resolution, FileStore } /** - * Get the estimated size in bytes of the placenames not in the World Wind file cache for the given sector and + * Get the estimated size in bytes of the placenames not in the WorldWind file cache for the given sector and * resolution. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * @@ -1308,13 +1332,13 @@ public long getEstimatedMissingDataSize(Sector sector, double resolution) /** * Get the estimated size in bytes of the placenames not in a specified file store for the given sector and * resolution. - *

        + *

        * Note that the target resolution must be provided in radians of latitude per texel, which is the resolution in * meters divided by the globe radius. * * @param sector the sector to estimate. * @param resolution the target resolution, provided in radians of latitude per texel. - * @param fileStore the file store to examine. If null the current World Wind file cache is used. + * @param fileStore the file store to examine. If null the current WorldWind file cache is used. * * @return the estimated size in byte of the missing placenames. * diff --git a/src/gov/nasa/worldwind/layers/placename/PlaceNameLayerBulkDownloader.java b/src/gov/nasa/worldwind/layers/placename/PlaceNameLayerBulkDownloader.java index caf6c6987e..cd6f63c399 100644 --- a/src/gov/nasa/worldwind/layers/placename/PlaceNameLayerBulkDownloader.java +++ b/src/gov/nasa/worldwind/layers/placename/PlaceNameLayerBulkDownloader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.placename; @@ -18,9 +40,9 @@ import java.util.*; /** - * Downloads placenames not currently available in the World Wind file cache or a specified {@link FileStore}. The class + * Downloads placenames not currently available in the WorldWind file cache or a specified {@link FileStore}. The class * derives from {@link Thread} and is meant to operate in its own thread. - *

        + *

        * The sector and resolution associated with the downloader are specified during construction and are final. * * @author tag @@ -36,8 +58,8 @@ public class PlaceNameLayerBulkDownloader extends BulkRetrievalThread protected long pollDelay = RETRIEVAL_SERVICE_POLL_DELAY; /** - * Constructs a downloader to retrieve placenames not currently available in the World Wind file cache. - *

        + * Constructs a downloader to retrieve placenames not currently available in the WorldWind file cache. + *

        * The thread returned is not started during construction, the caller must start the thread. * * @param layer the layer for which to download placenames. @@ -60,7 +82,7 @@ public PlaceNameLayerBulkDownloader(PlaceNameLayer layer, Sector sector, double /** * Constructs a downloader to retrieve placenames not currently available in a specified file store and places it * there. - *

        + *

        * The thread returned is not started during construction, the caller must start the thread. * * @param layer the layer for which to download placenames. diff --git a/src/gov/nasa/worldwind/layers/placename/PlaceNameService.java b/src/gov/nasa/worldwind/layers/placename/PlaceNameService.java index 8b121e5869..3f95dbfc0b 100644 --- a/src/gov/nasa/worldwind/layers/placename/PlaceNameService.java +++ b/src/gov/nasa/worldwind/layers/placename/PlaceNameService.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.placename; diff --git a/src/gov/nasa/worldwind/layers/placename/PlaceNameServiceSet.java b/src/gov/nasa/worldwind/layers/placename/PlaceNameServiceSet.java index 1a507b10af..9095894703 100644 --- a/src/gov/nasa/worldwind/layers/placename/PlaceNameServiceSet.java +++ b/src/gov/nasa/worldwind/layers/placename/PlaceNameServiceSet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.placename; diff --git a/src/gov/nasa/worldwind/layers/rpf/RPFFileIndex.java b/src/gov/nasa/worldwind/layers/rpf/RPFFileIndex.java index 0889822977..9cb7bdabcd 100644 --- a/src/gov/nasa/worldwind/layers/rpf/RPFFileIndex.java +++ b/src/gov/nasa/worldwind/layers/rpf/RPFFileIndex.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf; diff --git a/src/gov/nasa/worldwind/layers/rpf/RPFGenerator.java b/src/gov/nasa/worldwind/layers/rpf/RPFGenerator.java index 842389eb02..6c16f49588 100644 --- a/src/gov/nasa/worldwind/layers/rpf/RPFGenerator.java +++ b/src/gov/nasa/worldwind/layers/rpf/RPFGenerator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf; diff --git a/src/gov/nasa/worldwind/layers/rpf/RPFRetriever.java b/src/gov/nasa/worldwind/layers/rpf/RPFRetriever.java index 63fa5edf4f..c3b39d199e 100644 --- a/src/gov/nasa/worldwind/layers/rpf/RPFRetriever.java +++ b/src/gov/nasa/worldwind/layers/rpf/RPFRetriever.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf; diff --git a/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageLayer.java b/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageLayer.java index bac18fe7e5..9d391b408f 100644 --- a/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageLayer.java +++ b/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf; @@ -52,7 +74,7 @@ static Collection createTopLevelTiles(AVList params) Angle latOrigin = levels.getTileOrigin().getLatitude(); Angle lonOrigin = levels.getTileOrigin().getLongitude(); - // Determine the row and column offset from the common World Wind global tiling origin. + // Determine the row and column offset from the common WorldWind global tiling origin. int firstRow = Tile.computeRow(dLat, sector.getMinLatitude(), latOrigin); int firstCol = Tile.computeColumn(dLon, sector.getMinLongitude(), lonOrigin); int lastRow = Tile.computeRow(dLat, sector.getMaxLatitude(), latOrigin); diff --git a/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageProcessor.java b/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageProcessor.java index fbcaf437a5..206693b4b3 100644 --- a/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageProcessor.java +++ b/src/gov/nasa/worldwind/layers/rpf/RPFTiledImageProcessor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanel.java b/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanel.java index b7a94302ce..d9f2dc461e 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanel.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanelDescriptor.java b/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanelDescriptor.java index 5e5edcff83..892d1248e3 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanelDescriptor.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/DataChooserPanelDescriptor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/ETRCalculator.java b/src/gov/nasa/worldwind/layers/rpf/wizard/ETRCalculator.java index ae53aa52d0..6f697dc371 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/ETRCalculator.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/ETRCalculator.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanel.java b/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanel.java index f560ac0ab3..9c4d0dc619 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanel.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanelDescriptor.java b/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanelDescriptor.java index 18d790006b..cceadabb8e 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanelDescriptor.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/FileChooserPanelDescriptor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/FileSearchPanelDescriptor.java b/src/gov/nasa/worldwind/layers/rpf/wizard/FileSearchPanelDescriptor.java index 6b0810a99c..831bba5a55 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/FileSearchPanelDescriptor.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/FileSearchPanelDescriptor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/FileSet.java b/src/gov/nasa/worldwind/layers/rpf/wizard/FileSet.java index 876e240df6..a87b80da35 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/FileSet.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/FileSet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/PreprocessPanelDescriptor.java b/src/gov/nasa/worldwind/layers/rpf/wizard/PreprocessPanelDescriptor.java index 94dc91b32a..c48b0fe3e7 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/PreprocessPanelDescriptor.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/PreprocessPanelDescriptor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/ProgressPanel.java b/src/gov/nasa/worldwind/layers/rpf/wizard/ProgressPanel.java index f5973cd75e..031cd40f89 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/ProgressPanel.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/ProgressPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/RPFImportWizard.java b/src/gov/nasa/worldwind/layers/rpf/wizard/RPFImportWizard.java index d08bbe13de..94e4594331 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/RPFImportWizard.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/RPFImportWizard.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/RPFWizardUtil.java b/src/gov/nasa/worldwind/layers/rpf/wizard/RPFWizardUtil.java index d1f57ee737..ad973859e6 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/RPFWizardUtil.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/RPFWizardUtil.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/SizeFormatter.java b/src/gov/nasa/worldwind/layers/rpf/wizard/SizeFormatter.java index 59e748506d..ad4cd71577 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/SizeFormatter.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/SizeFormatter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/layers/rpf/wizard/TimeFormatter.java b/src/gov/nasa/worldwind/layers/rpf/wizard/TimeFormatter.java index 56ae5159cc..038c3b1478 100644 --- a/src/gov/nasa/worldwind/layers/rpf/wizard/TimeFormatter.java +++ b/src/gov/nasa/worldwind/layers/rpf/wizard/TimeFormatter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.layers.rpf.wizard; diff --git a/src/gov/nasa/worldwind/ogc/OGCAddress.java b/src/gov/nasa/worldwind/ogc/OGCAddress.java index 099c576d19..0685e022b5 100644 --- a/src/gov/nasa/worldwind/ogc/OGCAddress.java +++ b/src/gov/nasa/worldwind/ogc/OGCAddress.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCBoundingBox.java b/src/gov/nasa/worldwind/ogc/OGCBoundingBox.java index a1e7c7f087..98a3097157 100644 --- a/src/gov/nasa/worldwind/ogc/OGCBoundingBox.java +++ b/src/gov/nasa/worldwind/ogc/OGCBoundingBox.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCCapabilities.java b/src/gov/nasa/worldwind/ogc/OGCCapabilities.java index 8dd6b21920..12b4bed14f 100644 --- a/src/gov/nasa/worldwind/ogc/OGCCapabilities.java +++ b/src/gov/nasa/worldwind/ogc/OGCCapabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCCapabilityInformation.java b/src/gov/nasa/worldwind/ogc/OGCCapabilityInformation.java index babf4f5053..b60b922de9 100644 --- a/src/gov/nasa/worldwind/ogc/OGCCapabilityInformation.java +++ b/src/gov/nasa/worldwind/ogc/OGCCapabilityInformation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCConstants.java b/src/gov/nasa/worldwind/ogc/OGCConstants.java index 5d1ec91472..c3ee7403d6 100644 --- a/src/gov/nasa/worldwind/ogc/OGCConstants.java +++ b/src/gov/nasa/worldwind/ogc/OGCConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCContactInformation.java b/src/gov/nasa/worldwind/ogc/OGCContactInformation.java index d4e358c978..2a9d4f28b3 100644 --- a/src/gov/nasa/worldwind/ogc/OGCContactInformation.java +++ b/src/gov/nasa/worldwind/ogc/OGCContactInformation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCDCType.java b/src/gov/nasa/worldwind/ogc/OGCDCType.java index 02465b44f6..0c55428dbe 100644 --- a/src/gov/nasa/worldwind/ogc/OGCDCType.java +++ b/src/gov/nasa/worldwind/ogc/OGCDCType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCOnlineResource.java b/src/gov/nasa/worldwind/ogc/OGCOnlineResource.java index 6d56734567..e30ae3cf86 100644 --- a/src/gov/nasa/worldwind/ogc/OGCOnlineResource.java +++ b/src/gov/nasa/worldwind/ogc/OGCOnlineResource.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCRequestDescription.java b/src/gov/nasa/worldwind/ogc/OGCRequestDescription.java index 4938eded84..91044d9e45 100644 --- a/src/gov/nasa/worldwind/ogc/OGCRequestDescription.java +++ b/src/gov/nasa/worldwind/ogc/OGCRequestDescription.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/OGCServiceInformation.java b/src/gov/nasa/worldwind/ogc/OGCServiceInformation.java index ce892ffefe..5d3e2df26b 100644 --- a/src/gov/nasa/worldwind/ogc/OGCServiceInformation.java +++ b/src/gov/nasa/worldwind/ogc/OGCServiceInformation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractGeometry.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractGeometry.java index 6d17659f1c..51bc0662e9 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractGeometry.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractGeometry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractInstance.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractInstance.java index 611296e15d..306493f837 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractInstance.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractInstance.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractObject.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractObject.java index 57a2e01e82..b2948af494 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractObject.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractObject.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractParamContainer.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractParamContainer.java index 34b5fbf627..02558ea7bb 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractParamContainer.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractParamContainer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractShader.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractShader.java index d932335583..68a3983113 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractShader.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAbstractShader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAccessor.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAccessor.java index 87a2d0cafe..a0bcc2d20b 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAccessor.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAccessor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaAsset.java b/src/gov/nasa/worldwind/ogc/collada/ColladaAsset.java index b6a7b195a0..73d3fb8f58 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaAsset.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaAsset.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaBind.java b/src/gov/nasa/worldwind/ogc/collada/ColladaBind.java index 5a84c7e6af..afdf62824b 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaBind.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaBind.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaBindMaterial.java b/src/gov/nasa/worldwind/ogc/collada/ColladaBindMaterial.java index 9208a144db..b045bcea7d 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaBindMaterial.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaBindMaterial.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaBindVertexInput.java b/src/gov/nasa/worldwind/ogc/collada/ColladaBindVertexInput.java index f5d5c7d594..3de788b58a 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaBindVertexInput.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaBindVertexInput.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaColor.java b/src/gov/nasa/worldwind/ogc/collada/ColladaColor.java index 710d466557..0769a351ec 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaColor.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaColor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaConstants.java b/src/gov/nasa/worldwind/ogc/collada/ColladaConstants.java index bb69ba01d8..8171d115f2 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaConstants.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaContributor.java b/src/gov/nasa/worldwind/ogc/collada/ColladaContributor.java index 7538b248fe..e9b3c7c539 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaContributor.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaContributor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaEffect.java b/src/gov/nasa/worldwind/ogc/collada/ColladaEffect.java index 8555a7f505..391cc09ec9 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaEffect.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaEffect.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaExtra.java b/src/gov/nasa/worldwind/ogc/collada/ColladaExtra.java index fcbcfc9eb5..fbe837abf8 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaExtra.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaExtra.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaFloatArray.java b/src/gov/nasa/worldwind/ogc/collada/ColladaFloatArray.java index 0e900d1eab..901d377c00 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaFloatArray.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaFloatArray.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaFloatOrParam.java b/src/gov/nasa/worldwind/ogc/collada/ColladaFloatOrParam.java index 95619b5691..0f8f14f260 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaFloatOrParam.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaFloatOrParam.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaFormat.java b/src/gov/nasa/worldwind/ogc/collada/ColladaFormat.java index 489fbd8d91..1c72be105a 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaFormat.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaFormat.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaGeometry.java b/src/gov/nasa/worldwind/ogc/collada/ColladaGeometry.java index 24b29b13f9..178745fa95 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaGeometry.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaGeometry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaImage.java b/src/gov/nasa/worldwind/ogc/collada/ColladaImage.java index e0cb43ded4..f6ba42b0d8 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaImage.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaImage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaInput.java b/src/gov/nasa/worldwind/ogc/collada/ColladaInput.java index 57dbf39715..e067e3869e 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaInput.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaInput.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceEffect.java b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceEffect.java index c39db075dc..1914a373b6 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceEffect.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceEffect.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceGeometry.java b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceGeometry.java index 4e0848a081..1f2714edcc 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceGeometry.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceGeometry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceMaterial.java b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceMaterial.java index e0f376900b..0f1f130366 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceMaterial.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceMaterial.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceNode.java b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceNode.java index 00a5bef33c..aa3eb47971 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceNode.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceNode.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceVisualScene.java b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceVisualScene.java index 6690917e58..19e32e2c78 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceVisualScene.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaInstanceVisualScene.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaLambert.java b/src/gov/nasa/worldwind/ogc/collada/ColladaLambert.java index 00b6badd2d..e5653554b0 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaLambert.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaLambert.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaLibrary.java b/src/gov/nasa/worldwind/ogc/collada/ColladaLibrary.java index bb7eed5d94..198622ced4 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaLibrary.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaLibrary.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaLines.java b/src/gov/nasa/worldwind/ogc/collada/ColladaLines.java index 0c1ea7b5b1..a3df36db83 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaLines.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaLines.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaMaterial.java b/src/gov/nasa/worldwind/ogc/collada/ColladaMaterial.java index fa4cc5ffff..6144b68ce5 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaMaterial.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaMaterial.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaMatrix.java b/src/gov/nasa/worldwind/ogc/collada/ColladaMatrix.java index e843c27c2e..9f90e622f8 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaMatrix.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaMatrix.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaMesh.java b/src/gov/nasa/worldwind/ogc/collada/ColladaMesh.java index 78e5ab9e5d..42c5094b95 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaMesh.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaMesh.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaNewParam.java b/src/gov/nasa/worldwind/ogc/collada/ColladaNewParam.java index 4767dbe0b3..163183aef0 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaNewParam.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaNewParam.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaNode.java b/src/gov/nasa/worldwind/ogc/collada/ColladaNode.java index 7b2e7f4cd4..1b48662ddd 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaNode.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaNode.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaP.java b/src/gov/nasa/worldwind/ogc/collada/ColladaP.java index 9af2cd54d5..c4fc2c9edc 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaP.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaP.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaParam.java b/src/gov/nasa/worldwind/ogc/collada/ColladaParam.java index 1aaf9dc954..dab6251bfd 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaParam.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaParam.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaParserContext.java b/src/gov/nasa/worldwind/ogc/collada/ColladaParserContext.java index 23035b77af..3b639e2cec 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaParserContext.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaParserContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; @@ -165,7 +187,7 @@ protected void initializeParsers(String ns) this.parsers.put(new QName(ns, "lines"), new ColladaLines(ns)); this.parsers.put(new QName(ns, "extra"), new ColladaExtra(ns)); - // The following elements are valid COLLADA markup, but are not used by World Wind. + // The following elements are valid COLLADA markup, but are not used by WorldWind. parser = new ColladaUnsupported(ns); this.parsers.put(new QName(ns, "library_cameras"), parser); this.parsers.put(new QName(ns, "instance_camera"), parser); diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaPhong.java b/src/gov/nasa/worldwind/ogc/collada/ColladaPhong.java index 9b5f60c1bb..deac46c859 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaPhong.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaPhong.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaProfileCommon.java b/src/gov/nasa/worldwind/ogc/collada/ColladaProfileCommon.java index 834279e640..77545e57c0 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaProfileCommon.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaProfileCommon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaResourceResolver.java b/src/gov/nasa/worldwind/ogc/collada/ColladaResourceResolver.java index 0b5a55db33..6d60dcb0be 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaResourceResolver.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaResourceResolver.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaRoot.java b/src/gov/nasa/worldwind/ogc/collada/ColladaRoot.java index 89f3854095..89c1bfc3a3 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaRoot.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaRoot.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; @@ -228,14 +250,14 @@ else if (docSource instanceof InputStream) } /** - * Creates and parses a Collada root for an untyped source. The source must be either a {@link File} or a {@link - * String} identifying either a file path or a {@link URL}. Null is returned if the source type is not recognized. + * Creates and parses a Collada root for an untyped source.The source must be either a {@link File} or a {@link String} identifying either a file path or a {@link URL}. Null is returned if the source type is not recognized. * * @param docSource either a {@link File} or a {@link String} identifying a file path or {@link URL}. * * @return a new {@link ColladaRoot} for the specified source, or null if the source type is not supported. * * @throws IllegalArgumentException if the source is null. + * @throws javax.xml.stream.XMLStreamException if the XML stream is not readable. * @throws IOException if an error occurs while reading the source. */ public static ColladaRoot createAndParse(Object docSource) throws IOException, XMLStreamException @@ -324,9 +346,9 @@ public int getAltitudeMode() /** * Specifies this shape's altitude mode, one of {@link WorldWind#ABSOLUTE}, {@link WorldWind#RELATIVE_TO_GROUND} or * {@link WorldWind#CLAMP_TO_GROUND}. - *

        + *

        * Note: If the altitude mode is unrecognized, {@link WorldWind#ABSOLUTE} is used. - *

        + *

        * Note: Subclasses may recognize additional altitude modes or may not recognize the ones described above. * * @param altitudeMode the altitude mode. The default value is {@link WorldWind#ABSOLUTE}. @@ -534,7 +556,7 @@ public Object resolveReference(String link) /** * Resolves a reference to a local element identified by address and identifier, where {@code linkBase} identifies a * document, including the current document, and {@code linkRef} is the id of the desired element. - *

        + *

        * If {@code linkBase} refers to a local COLLADA file and {@code linkRef} is non-null, the return value is the * element identified by {@code linkRef}. If {@code linkRef} is null, the return value is a parsed {@link * ColladaRoot} for the COLLADA file identified by {@code linkBase}. Otherwise, {@code linkBase} is returned. @@ -591,7 +613,7 @@ protected Object resolveLocalReference(String linkBase, String linkRef) * Resolves a reference to a remote element identified by address and identifier, where {@code linkBase} identifies * a remote document, and {@code linkRef} is the id of the desired element. This method retrieves resources * asynchronously using the {@link gov.nasa.worldwind.cache.FileStore}. - *

        + *

        * The return value is null if the file is not yet available in the FileStore. If {@code linkBase} refers to a * COLLADA file and {@code linkRef} is non-null, the return value is the element identified by {@code linkRef}. If * {@code linkBase} refers to a COLLADA file and {@code linkRef} is null, the return value is a parsed {@link diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaSampler2D.java b/src/gov/nasa/worldwind/ogc/collada/ColladaSampler2D.java index 701fb1517a..02c6f8c6bb 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaSampler2D.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaSampler2D.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaScene.java b/src/gov/nasa/worldwind/ogc/collada/ColladaScene.java index c5a324c084..2924f49e81 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaScene.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaScene.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaSource.java b/src/gov/nasa/worldwind/ogc/collada/ColladaSource.java index fdfc5e631d..55d223eb7c 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaSource.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaSource.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaSurface.java b/src/gov/nasa/worldwind/ogc/collada/ColladaSurface.java index 3f5a3e3b56..0d556b923a 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaSurface.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaSurface.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaTechnique.java b/src/gov/nasa/worldwind/ogc/collada/ColladaTechnique.java index bc5032cbb8..23fd0d9300 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaTechnique.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaTechnique.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaTechniqueCommon.java b/src/gov/nasa/worldwind/ogc/collada/ColladaTechniqueCommon.java index 1157531a58..9ea3926fe0 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaTechniqueCommon.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaTechniqueCommon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaTexture.java b/src/gov/nasa/worldwind/ogc/collada/ColladaTexture.java index bb07b219e1..efb2945c07 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaTexture.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaTexture.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaTextureOrColor.java b/src/gov/nasa/worldwind/ogc/collada/ColladaTextureOrColor.java index 714f75424d..07d8ff92a7 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaTextureOrColor.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaTextureOrColor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaTriangles.java b/src/gov/nasa/worldwind/ogc/collada/ColladaTriangles.java index 5dd6446394..a95ca4e093 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaTriangles.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaTriangles.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaUnit.java b/src/gov/nasa/worldwind/ogc/collada/ColladaUnit.java index 3f30eae09f..5e1a1b0fd7 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaUnit.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaUnit.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaUnsupported.java b/src/gov/nasa/worldwind/ogc/collada/ColladaUnsupported.java index f0f28b08f4..022e8b1521 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaUnsupported.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaUnsupported.java @@ -1,13 +1,35 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; /** - * Parser class for COLLADA elements that are not used by World Wind. + * Parser class for COLLADA elements that are not used by WorldWind. * * @author pabercrombie * @version $Id: ColladaUnsupported.java 642 2012-06-14 17:31:29Z pabercrombie $ diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaVertices.java b/src/gov/nasa/worldwind/ogc/collada/ColladaVertices.java index 9618beade0..2705c199d7 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaVertices.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaVertices.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/ColladaVisualScene.java b/src/gov/nasa/worldwind/ogc/collada/ColladaVisualScene.java index 4998905827..ef9899f8b5 100644 --- a/src/gov/nasa/worldwind/ogc/collada/ColladaVisualScene.java +++ b/src/gov/nasa/worldwind/ogc/collada/ColladaVisualScene.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaController.java b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaController.java index a41ebe16e9..97bd26ba6c 100644 --- a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaController.java +++ b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.impl; @@ -11,8 +33,8 @@ import gov.nasa.worldwind.util.Logging; /** - * Executes the mapping from COLLADA to World Wind. Traverses a parsed COLLADA document and creates the appropriate - * World Wind object to represent the COLLADA model. + * Executes the mapping from COLLADA to WorldWind. Traverses a parsed COLLADA document and creates the appropriate + * WorldWind object to represent the COLLADA model. * * @author pabercrombie * @version $Id: ColladaController.java 661 2012-06-26 18:02:23Z pabercrombie $ diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java index 4658d0cf30..953e824455 100644 --- a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java +++ b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.impl; @@ -17,7 +39,7 @@ import gov.nasa.worldwind.terrain.Terrain; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.nio.FloatBuffer; import java.util.*; @@ -29,7 +51,7 @@ * instances are created by {@link #createTriangleMesh(java.util.List, gov.nasa.worldwind.ogc.collada.ColladaBindMaterial) * createTriangleMesh} and {@link #createLineMesh(java.util.List, gov.nasa.worldwind.ogc.collada.ColladaBindMaterial) * createLineMesh}. - *

        + *

        * This shape supports only COLLADA line and triangle geometries. * * @author pabercrombie @@ -227,6 +249,7 @@ public int hashCode() * * @param geometries COLLADA elements that defines geometry for this shape. Must contain at least one element. * @param bindMaterial Material applied to the mesh. May be null. + * @return The resulting shape. */ public static ColladaMeshShape createTriangleMesh(List geometries, ColladaBindMaterial bindMaterial) @@ -245,6 +268,7 @@ public static ColladaMeshShape createTriangleMesh(List geometr * * @param geometries COLLADA elements that defines geometry for this shape. Must contain at least one element. * @param bindMaterial Material applied to the mesh. May be null. + * @return The resulting shape. */ public static ColladaMeshShape createLineMesh(List geometries, ColladaBindMaterial bindMaterial) @@ -283,7 +307,7 @@ protected ColladaMeshShape(List geometries) /** * {@inheritDoc} - *

        + *

        * COLLADA shapes do not support intersection tests because the shape may be rendered multiple times with different * transform matrices. It's not possible to determine intersection without the transform matrix applied when the * shape is rendered. @@ -721,7 +745,7 @@ protected AbstractShapeData createCacheEntry(DrawContext dc) /** * Compute enough geometry to determine this shape's extent, reference point and eye distance. - *

        + *

        * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -967,7 +991,7 @@ protected Vec4 computeReferenceCenter(DrawContext dc) /** * Computes the minimum distance between this shape and the eye point. - *

        + *

        * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1043,6 +1067,7 @@ protected boolean mustApplyTexture(Geometry geometry) /** * Indicates the texture applied to this shape. * + * @param geometry The geometry to set the texture from. * @return The texture that must be applied to the shape, or null if there is no texture, or the texture is not * available. */ diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaRenderable.java b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaRenderable.java index e27d390d91..73c105b372 100644 --- a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaRenderable.java +++ b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaRenderable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.impl; diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaTraversalContext.java b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaTraversalContext.java index ab002b73f9..a6911cf83d 100644 --- a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaTraversalContext.java +++ b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaTraversalContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.impl; diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/package-info.java b/src/gov/nasa/worldwind/ogc/collada/impl/package-info.java new file mode 100644 index 0000000000..5f781ac3a3 --- /dev/null +++ b/src/gov/nasa/worldwind/ogc/collada/impl/package-info.java @@ -0,0 +1,35 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for rendering COLLADA documents. The {@link gov.nasa.worldwind.ogc.collada.impl.ColladaController} + * can be used to render a parsed COLLADA document in WorldWind.

        + * + */ +package gov.nasa.worldwind.ogc.collada.impl; diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/package.html b/src/gov/nasa/worldwind/ogc/collada/impl/package.html deleted file mode 100644 index 94905389b5..0000000000 --- a/src/gov/nasa/worldwind/ogc/collada/impl/package.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - COLLADA Implementation Package - - -

        Provides classes for rendering COLLADA documents. The {@link gov.nasa.worldwind.ogc.collada.impl.ColladaController} - can be used to render a parsed COLLADA document in World Wind.

        - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/ogc/collada/io/ColladaDoc.java b/src/gov/nasa/worldwind/ogc/collada/io/ColladaDoc.java index fb8bba581b..cbfeca82b4 100644 --- a/src/gov/nasa/worldwind/ogc/collada/io/ColladaDoc.java +++ b/src/gov/nasa/worldwind/ogc/collada/io/ColladaDoc.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.io; @@ -18,7 +40,7 @@ public interface ColladaDoc { /** * Returns an {@link java.io.InputStream} to the associated COLLADA document. - *

        + *

        * Implementations of this interface do not close the stream; the user of the class must close the stream. * * @return an input stream positioned to the head of the COLLADA document. diff --git a/src/gov/nasa/worldwind/ogc/collada/io/ColladaFile.java b/src/gov/nasa/worldwind/ogc/collada/io/ColladaFile.java index 609ead9ed8..ebf38e2b69 100644 --- a/src/gov/nasa/worldwind/ogc/collada/io/ColladaFile.java +++ b/src/gov/nasa/worldwind/ogc/collada/io/ColladaFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.io; diff --git a/src/gov/nasa/worldwind/ogc/collada/io/ColladaInputStream.java b/src/gov/nasa/worldwind/ogc/collada/io/ColladaInputStream.java index 81d33318cc..8c22e12999 100644 --- a/src/gov/nasa/worldwind/ogc/collada/io/ColladaInputStream.java +++ b/src/gov/nasa/worldwind/ogc/collada/io/ColladaInputStream.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.collada.io; diff --git a/src/gov/nasa/worldwind/ogc/collada/io/package-info.java b/src/gov/nasa/worldwind/ogc/collada/io/package-info.java new file mode 100644 index 0000000000..0813df88b1 --- /dev/null +++ b/src/gov/nasa/worldwind/ogc/collada/io/package-info.java @@ -0,0 +1,34 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for COLLADA file and stream I/O and relative-path resolution.

        + * + */ +package gov.nasa.worldwind.ogc.collada.io; diff --git a/src/gov/nasa/worldwind/ogc/collada/io/package.html b/src/gov/nasa/worldwind/ogc/collada/io/package.html deleted file mode 100644 index adccbe0960..0000000000 --- a/src/gov/nasa/worldwind/ogc/collada/io/package.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - COLLADA Parser I/O Package - - -

        Provides classes for COLLADA file and stream I/O and relative-path resolution.

        - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/ogc/collada/package-info.java b/src/gov/nasa/worldwind/ogc/collada/package-info.java new file mode 100644 index 0000000000..ac58730ec8 --- /dev/null +++ b/src/gov/nasa/worldwind/ogc/collada/package-info.java @@ -0,0 +1,71 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for parsing COLLADA files and streams.

        + *

        How to Parse a COLLADA File or Stream

        + *
          + *
        1. + * Create a {@link gov.nasa.worldwind.ogc.collada.ColladaRoot} via one of its constructors, such as {@link + * gov.nasa.worldwind.ogc.collada.ColladaRoot#ColladaRoot(java.io.File)}, passing the COLLADA source to the constructor. + * A ColladaRoot provides access to the COLLADA contents. The source can be either a file, an input stream, + * or a URL. + *
        2. + *
        3. + * Call {@link gov.nasa.worldwind.ogc.collada.ColladaRoot#parse(Object[])} to parse the document. + *
        4. + *
        5. + * The ColladaRoot class provides accessor methods for the COLLADA element of the COLLADA + * file, its root. The content includes the element's asset and scene elements. Once the root is parsed, + * use these methods to obtain objects representing these elements, and use the accessor methods of those objects in + * turn to obtain their contents. + *
        6. + *
        7. + * Each COLLADA element defined in the COLLADA specification version 1.4.1 + * has a corresponding class provided in this package. Each of those classes contains methods to obtain the element's + * contents as defined by the specification. + *
        8. + *
        + * +

        Extending the Classes

        + * +

        + * This package's classes are designed for easy behavior modification and replacement, and for straightforward addition + * of operations to be performed during parsing. See the description of {@link + * gov.nasa.worldwind.util.xml.AbstractXMLEventParser} for further information.

        + * +

        Relative References

        + * +

        + * By default, relative references will be resolved relative to the location of the COLLADA file that includes the + * reference. However, this behavior can be overridden by providing the ColladaRoot with a {@link + * gov.nasa.worldwind.ogc.collada.ColladaResourceResolver}.

        + * + */ +package gov.nasa.worldwind.ogc.collada; diff --git a/src/gov/nasa/worldwind/ogc/collada/package.html b/src/gov/nasa/worldwind/ogc/collada/package.html deleted file mode 100644 index 078d3bd41c..0000000000 --- a/src/gov/nasa/worldwind/ogc/collada/package.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - COLLADA Parser Package - - -

        Provides classes for parsing COLLADA files and streams.

        -

        How to Parse a COLLADA File or Stream

        -
          -
        1. - Create a {@link gov.nasa.worldwind.ogc.collada.ColladaRoot} via one of its constructors, such as {@link - gov.nasa.worldwind.ogc.collada.ColladaRoot#ColladaRoot(java.io.File)}, passing the COLLADA source to the - constructor. A ColladaRoot provides access to the COLLADA contents. The source can be either a - file, an input stream, or a URL. -
        2. -
        3. - Call {@link gov.nasa.worldwind.ogc.collada.ColladaRoot#parse(Object[])} to parse the document. -
        4. -
        5. - The ColladaRoot class provides accessor methods for the COLLADA element of the COLLADA - file, its root. The content includes the element's asset and scene elements. Once the root is - parsed, use these methods to obtain objects representing these elements, and use the accessor methods of those - objects in turn to obtain their contents. -
        6. -
        7. - Each COLLADA element defined in the COLLADA specification version - 1.4.1 has a corresponding - class provided in this package. Each of those classes contains methods to obtain the element's contents as - defined by the specification. -
        8. -
        - -

        Extending the Classes

        - -

        This package's classes are designed for easy behavior modification and replacement, and for straightforward addition - of operations to be performed during parsing. See the description of {@link - gov.nasa.worldwind.util.xml.AbstractXMLEventParser} for further information.

        - -

        Relative References

        - -

        By default, relative references will be resolved relative to the location of the COLLADA file that includes the - reference. However, this behavior can be overridden by providing the ColladaRoot with a {@link - gov.nasa.worldwind.ogc.collada.ColladaResourceResolver}.

        - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLEnvelope.java b/src/gov/nasa/worldwind/ogc/gml/GMLEnvelope.java index 743e49dd9d..df5bb07540 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLEnvelope.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLEnvelope.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLEnvelopeWithTimePeriod.java b/src/gov/nasa/worldwind/ogc/gml/GMLEnvelopeWithTimePeriod.java index 10e06d2de2..7d899434c5 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLEnvelopeWithTimePeriod.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLEnvelopeWithTimePeriod.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLGrid.java b/src/gov/nasa/worldwind/ogc/gml/GMLGrid.java index 593b9765f1..ff4df8a980 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLGrid.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLGrid.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLGridEnvelope.java b/src/gov/nasa/worldwind/ogc/gml/GMLGridEnvelope.java index 488d49a38d..b677e12f26 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLGridEnvelope.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLGridEnvelope.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLLimits.java b/src/gov/nasa/worldwind/ogc/gml/GMLLimits.java index 9ebf20ecb9..fcb6fbe10f 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLLimits.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLLimits.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLOrigin.java b/src/gov/nasa/worldwind/ogc/gml/GMLOrigin.java index e777b8cc64..b34f329e84 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLOrigin.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLOrigin.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLPos.java b/src/gov/nasa/worldwind/ogc/gml/GMLPos.java index 3172f640d8..b60d82938d 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLPos.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLPos.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/gml/GMLRectifiedGrid.java b/src/gov/nasa/worldwind/ogc/gml/GMLRectifiedGrid.java index 2594584de5..b47e68fcd0 100644 --- a/src/gov/nasa/worldwind/ogc/gml/GMLRectifiedGrid.java +++ b/src/gov/nasa/worldwind/ogc/gml/GMLRectifiedGrid.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.gml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractColorStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractColorStyle.java index eb5d80cc90..522468ecca 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractColorStyle.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractColorStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractContainer.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractContainer.java index 94815aca40..76f5893368 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractContainer.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractContainer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -67,7 +89,7 @@ public void removeFeature(KMLAbstractFeature feature) * Indicates whether this KMLAbstractContainer is active and should be rendered on the specified * DrawContext. This returns true if this container's visibility is * unspecified (null) or is set to true. - *

        + *

        * Regions do not apply directly to KML containers, because a descendant features can override the container's * Region with its own. Since a descendant Region may be larger or have a less restrictive LOD range than this * container, we cannot determine the visibility of the entire tree based on this container's Region. A container's @@ -87,7 +109,7 @@ protected boolean isFeatureActive(KMLTraversalContext tc, DrawContext dc) /** * Pre-renders the KML features held by this KMLAbstractContainer. - *

        + *

        * Pushes this container's Region on the KML traversal context's region stack before rendering the features, and * pops the Region off the stack afterward. Descendant features use the KML traversal context's region stack to * inherit Regions from parent containers. @@ -111,7 +133,7 @@ protected void doPreRender(KMLTraversalContext tc, DrawContext dc) /** * Renders the KML features held by this KMLAbstractContainer. - *

        + *

        * Pushes this container's Region on the KML traversal context's region stack before rendering the features, and * pops the Region off the stack afterward. Descendant features use the KML traversal context's region stack to * inherit Regions from parent containers. diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractEventParser.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractEventParser.java index 9f2d11e125..aefd883df5 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractEventParser.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractEventParser.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractFeature.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractFeature.java index a94b3585e9..13f3b22ba5 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractFeature.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -20,7 +42,7 @@ /** * Represents the KML Feature element and provides access to its contents. - *

        + *

        * KMLAbstractFeature implements the KMLRenderable interface, but does not actually render * anything. Subclasses should override the methods {@link #doPreRender(gov.nasa.worldwind.ogc.kml.impl.KMLTraversalContext, * gov.nasa.worldwind.render.DrawContext)} and {@link #doRender(gov.nasa.worldwind.ogc.kml.impl.KMLTraversalContext, @@ -224,7 +246,7 @@ public KMLExtendedData getExtendedData() /** * Set the balloon associated with this feature. - *

        + *

        * Note: Balloon is not a field in the KML Feature element. It's a direct field of this class and enables the client * to associate a balloon with the feature. * @@ -294,14 +316,13 @@ public void render(KMLTraversalContext tc, DrawContext dc) /** * Indicates whether this KMLAbstractFeature is active and should be rendered on the specified * DrawContext. This returns true if the following conditions are all true: - *

        *

        • This feature's visibility is unspecified (null) or is set to * true.
        • This feature as no Region and does not inherit a Region from an ancestor, or its * Region is active for the specified DrawContext.
        - *

        + *

        * If this feature has no Region, this inherits the Region of its nearest ancestor by using the Region on the top of * the KML traversal context's region stack (if any). If there is no ancestor Region this feature is assumed to be - * the DrawContext's view and is rendered according to its visibility flag. A Region is + * the DrawContext's view and is rendered according to its visibility flag. A Region is * considered active if it is visible, and the DrawContext meets the Region's level of detail * criteria. * @@ -364,7 +385,7 @@ protected void renderBalloon(KMLTraversalContext tc, DrawContext dc) * Obtains the effective values for a specified sub-style (IconStyle, ListStyle, etc.) and state * (normal or highlight). The returned style is the result of merging values from this feature * instance's style selectors and its styleUrl, if any, with precedence given to style selectors. - *

        + *

        * A remote styleUrl that has not yet been resolved is not included in the result. In this case the returned * sub-style is marked with the value {@link gov.nasa.worldwind.avlist.AVKey#UNRESOLVED}. The same is true when a * StyleMap style selector contains a reference to an external Style and that reference has not been resolved. diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractGeometry.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractGeometry.java index aa52b6a8e5..46775f7f1c 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractGeometry.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractGeometry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractLatLonBoxType.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractLatLonBoxType.java index c192800b57..b4de900512 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractLatLonBoxType.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractLatLonBoxType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractObject.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractObject.java index 1ffa092193..14845cc5c2 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractObject.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractObject.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractOverlay.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractOverlay.java index e75a44a465..e85e9179c3 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractOverlay.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractOverlay.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractStyleSelector.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractStyleSelector.java index 54deed7390..4e4c0870bd 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractStyleSelector.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractStyleSelector.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -33,7 +55,7 @@ protected KMLAbstractStyleSelector(String namespaceURI) * Obtains the selector's effective style for a specified style type (IconStyle, ListStyle, etc.) and * state (normal or highlight). The returned style is the result of merging values from the specified * style selectors and style URL, with precedence given to style selectors. - *

        + *

        * Remote styleUrls that have not yet been resolved are not included in the result. In this case the returned * sub-style is marked with a field named {@link gov.nasa.worldwind.avlist.AVKey#UNRESOLVED}. The same is true when * a StyleMap refers to a Style other than one internal to the KML document. @@ -88,7 +110,7 @@ public static KMLAbstractSubStyle mergeSubStyles(KMLStyleUrl styleUrl, * Obtains the selector's effective style for a specified style type (IconStyle, ListStyle, etc.) and * state (normal or highlight). The returned style is the result of merging values from the specified * style selector and style URL, with precedence given to style selector. - *

        + *

        * Remote styleUrls that have not yet been resolved are not included in the result. In this case the returned * sub-style is marked with the value {@link gov.nasa.worldwind.avlist.AVKey#UNRESOLVED}. * diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractSubStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractSubStyle.java index 6bd6cdeefc..4c72c6a056 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractSubStyle.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractSubStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractTimePrimitive.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractTimePrimitive.java index 1c31288dac..f78a47465e 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractTimePrimitive.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractTimePrimitive.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractView.java b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractView.java index a676cd2ba6..e8ab7fe430 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAbstractView.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAbstractView.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLAlias.java b/src/gov/nasa/worldwind/ogc/kml/KMLAlias.java index a51a9c0daf..8b4525e3d7 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLAlias.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLAlias.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLBalloonStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLBalloonStyle.java index 8f841530fa..14dfbc57ea 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLBalloonStyle.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLBalloonStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLBoundary.java b/src/gov/nasa/worldwind/ogc/kml/KMLBoundary.java index 8e4d11dfa6..12e993e667 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLBoundary.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLBoundary.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLCamera.java b/src/gov/nasa/worldwind/ogc/kml/KMLCamera.java index 6eadb310e5..21f1d5c3ea 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLCamera.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLCamera.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLChange.java b/src/gov/nasa/worldwind/ogc/kml/KMLChange.java index 313938f95b..d84346ed8d 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLChange.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLChange.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLConstants.java b/src/gov/nasa/worldwind/ogc/kml/KMLConstants.java index a547812e12..f08a606982 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLConstants.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLCoordinateTokenizer.java b/src/gov/nasa/worldwind/ogc/kml/KMLCoordinateTokenizer.java index a0194ddf1f..25b493e24e 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLCoordinateTokenizer.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLCoordinateTokenizer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -17,17 +39,17 @@ *

          * -18.3,23.5,0 -19.3,23.4,1 -20.0,23.5,2
          * 
        - *

        + *

        * However, some KML files do not follow the spec and embed white space within the coordinate tuples. This tokenizer * attempts to be lenient with whitespace handling. If a tuple ends with a comma, the tokenizer considers the next token * in the input stream to be part of the same coordinate, not the start of a new coordinate. - *

        + *

        * For example: *

          * -18.3,23.56,9     34.9, 56.0, 2     56.9, 19     90.0,23.9,44
          * 
        * Will be tokenized to four coordinates: (23.56, -18.3, 9), (56.0, 34.9, 2), (56.9, 19, 0), and (90, 23.9, 44). - *

        + *

        * The tokenizer also handles coordinate strings with no embedded white space. For example: *

          * -18.3,23.56,9,34.9,56.0,2
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLCoordinatesParser.java b/src/gov/nasa/worldwind/ogc/kml/KMLCoordinatesParser.java
        index 6550b8f2c3..5acd98ef1d 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLCoordinatesParser.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLCoordinatesParser.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLCreate.java b/src/gov/nasa/worldwind/ogc/kml/KMLCreate.java
        index c5df8f17e8..8fab8b3995 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLCreate.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLCreate.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLData.java b/src/gov/nasa/worldwind/ogc/kml/KMLData.java
        index 01d8afed34..4651932db8 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLData.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLData.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLDelete.java b/src/gov/nasa/worldwind/ogc/kml/KMLDelete.java
        index b250b15d08..bf792eef5b 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLDelete.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLDelete.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLDocument.java b/src/gov/nasa/worldwind/ogc/kml/KMLDocument.java
        index 06a6773ccc..1825c67829 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLDocument.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLDocument.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLExtendedData.java b/src/gov/nasa/worldwind/ogc/kml/KMLExtendedData.java
        index 04c9c9c5fb..74f3603e2f 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLExtendedData.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLExtendedData.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLFolder.java b/src/gov/nasa/worldwind/ogc/kml/KMLFolder.java
        index e699d59f6a..9ff6cc16b5 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLFolder.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLFolder.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLGroundOverlay.java b/src/gov/nasa/worldwind/ogc/kml/KMLGroundOverlay.java
        index 2ea22eb852..b746b9fd13 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLGroundOverlay.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLGroundOverlay.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLIcon.java b/src/gov/nasa/worldwind/ogc/kml/KMLIcon.java
        index eb53b3a7c0..1cc0e7e166 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLIcon.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLIcon.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLIconStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLIconStyle.java
        index fa7e96a6c4..a02a093479 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLIconStyle.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLIconStyle.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLImagePyramid.java b/src/gov/nasa/worldwind/ogc/kml/KMLImagePyramid.java
        index 53a3b4cac8..ab5205661c 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLImagePyramid.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLImagePyramid.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLItemIcon.java b/src/gov/nasa/worldwind/ogc/kml/KMLItemIcon.java
        index 6300590939..ad0aee828d 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLItemIcon.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLItemIcon.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLabelStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLLabelStyle.java
        index 2825c9acf7..5bf057be98 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLabelStyle.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLabelStyle.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLatLonAltBox.java b/src/gov/nasa/worldwind/ogc/kml/KMLLatLonAltBox.java
        index a4b68c6012..b553a8be01 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLatLonAltBox.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLatLonAltBox.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLatLonBox.java b/src/gov/nasa/worldwind/ogc/kml/KMLLatLonBox.java
        index 878a82c2f1..e405a0db92 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLatLonBox.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLatLonBox.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLineString.java b/src/gov/nasa/worldwind/ogc/kml/KMLLineString.java
        index 0a66fccd7d..306297c03f 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLineString.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLineString.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLineStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLLineStyle.java
        index a0f5c8a29e..95a873c06a 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLineStyle.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLineStyle.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLinearRing.java b/src/gov/nasa/worldwind/ogc/kml/KMLLinearRing.java
        index fca941257c..bdd0728806 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLinearRing.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLinearRing.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLink.java b/src/gov/nasa/worldwind/ogc/kml/KMLLink.java
        index a0b1056df1..691aac77cd 100644
        --- a/src/gov/nasa/worldwind/ogc/kml/KMLLink.java
        +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLink.java
        @@ -1,7 +1,29 @@
         /*
        - * Copyright (C) 2012 United States Government as represented by the Administrator of the
        - * National Aeronautics and Space Administration.
        - * All Rights Reserved.
        + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
        + * Administrator of the National Aeronautics and Space Administration.
        + * All rights reserved.
        + * 
        + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
        + * Version 2.0 (the "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + * http://www.apache.org/licenses/LICENSE-2.0
        + * 
        + * Unless required by applicable law or agreed to in writing, software distributed
        + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
        + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
        + * specific language governing permissions and limitations under the License.
        + * 
        + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
        + * software:
        + * 
        + *     Jackson Parser – Licensed under Apache 2.0
        + *     GDAL – Licensed under MIT
        + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
        + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
        + * 
        + * A complete listing of 3rd Party software notices and licenses included in
        + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
        + * notices and licenses PDF found in code directory.
          */
         
         package gov.nasa.worldwind.ogc.kml;
        @@ -271,9 +293,9 @@ public Object parse(XMLEventParserContext ctx, XMLEvent inputEvent, Object... ar
              * viewFormat and httpQuery. Otherwise, this returns the concatenation of the
              * href, the viewFormat and the httpQuery for form an absolute URL string. If
              * the the href contains a query string, the viewFormat and httpQuery are
        -     * appended to that string. If necessary, this inserts the & character between the href's
        +     * appended to that string. If necessary, this inserts the & character between the href's
              * query string, the viewFormat, and the httpQuery.
        -     * 

        + *

        * This substitutes the following parameters in viewFormat and httpQuery:

          *
        • [bboxWest],[bboxSouth],[bboxEast],[bboxNorth] - visible bounds of the globe, or 0 if the globe * is not visible. The visible bounds are scaled from their centroid by this link's @@ -286,8 +308,8 @@ public Object parse(XMLEventParserContext ctx, XMLEvent inputEvent, Object... ar * [cameraAlt] - view's eye position.
        • [horizFov], [vertFov] - view's horizontal and * vertical field of view.
        • [horizPixels], [vertPixels] - width and height of the * viewport.
        • [terrainEnabled] - always true
        • [clientVersion] - * - World Wind client version.
        • [clientName] - World Wind client name.
        • - *
        • [kmlVersion] - KML version supported by World Wind.
        • [language] - current + * - WorldWind client version.
        • [clientName] - WorldWind client name.
        • + *
        • [kmlVersion] - KML version supported by WorldWind.
        • [language] - current * locale's language.
        If the viewFormat is unspecified, and the viewRefreshMode * is one of onRequest, onStop or onRegion, this automatically appends the * following information to the query string: BBOX=[bboxWest],[bboxSouth],[bboxEast],[bboxNorth]. The diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLListStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLListStyle.java index 08d0db9dc3..3d4ef3fe02 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLListStyle.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLListStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLocation.java b/src/gov/nasa/worldwind/ogc/kml/KMLLocation.java index 58d18f0fb6..677ecd5067 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLLocation.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLocation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLod.java b/src/gov/nasa/worldwind/ogc/kml/KMLLod.java index ef8dbe45e9..d53d5b4bc8 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLLod.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLod.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLLookAt.java b/src/gov/nasa/worldwind/ogc/kml/KMLLookAt.java index 989b9593f3..e183f6233a 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLLookAt.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLLookAt.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLModel.java b/src/gov/nasa/worldwind/ogc/kml/KMLModel.java index ac9fe49c43..97d911d4a7 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLModel.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLModel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLMultiGeometry.java b/src/gov/nasa/worldwind/ogc/kml/KMLMultiGeometry.java index 895602df4f..9f6c37f019 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLMultiGeometry.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLMultiGeometry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLink.java b/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLink.java index 0a6ff859d3..06058403a4 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLink.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLink.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -19,13 +41,13 @@ /** * Represents the KML NetworkLink element and provides access to its contents. - *

        + *

        * During rendering, KMLNetworkLink retrieves and loads its network resource whenever necessary. Upon a * successful retrieval, KMLNetworkLink sends an AVKey.RETRIEVAL_STATE_SUCCESSFUL property * change event to this link's property change listeners. Once retrieved and loaded, KMLNetworkLink stores * its network resource by calling setNetworkResource, draws its network resource during preRendering and * rendering, and forwards property change events from the network resource to its property change listeners. - *

        + *

        * During retrieval, KMLNetworkLink attempts to use either the Link or the Url. * The Link is the preferred method for encoding a KML NetworkLink's address since KML version 2.1, * therefore we give it priority over Url. @@ -217,7 +239,7 @@ public Object getSnippet() /** * Specifies the network resource referenced by this KMLNetworkLink, or null if this link - * has no resource. If the specified kmlRoot is not nullkmlRoot is not null, this link draws the * kmlRoot during preRendering and rendering, and forwards property change events from the * kmlRoot to this link's property change listeners. * @@ -372,7 +394,7 @@ protected void requestResource(DrawContext dc) * resource is retrieved and loaded, this calls {@link #setNetworkResource(KMLRoot)} to specify this * link's new network resource, and sends an {@link gov.nasa.worldwind.avlist.AVKey#RETRIEVAL_STATE_SUCCESSFUL} * property change event to this link's property change listeners. - *

        + *

        * This does nothing if this KMLNetworkLink has no KMLLink. * * @param address the address of the resource to retrieve @@ -443,9 +465,8 @@ protected long computeExpiryRefreshTime(KMLRoot root, String address) /** * Indicates whether the network resource references by this KMLNetworkLink should be retrieved to the - * World Wind cache or to a temporary location. This returns true if all of the following conditions + * WorldWind cache or to a temporary location. This returns true if all of the following conditions * are met, and false otherwise: - *

        *

        • This network link has either a Link or a Url element.
        • The Link or Url * element's refreshMode is not onInterval or onExpire.
        • The Link or * Url element's viewRefreshMode is not onStop.
        diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLinkControl.java b/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLinkControl.java index 385cb037de..286342dddf 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLinkControl.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLNetworkLinkControl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLOrientation.java b/src/gov/nasa/worldwind/ogc/kml/KMLOrientation.java index 3313132cd7..6ef4cf4c56 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLOrientation.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLOrientation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLPair.java b/src/gov/nasa/worldwind/ogc/kml/KMLPair.java index 59e9c8b67f..9e7758283c 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLPair.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLPair.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLParserContext.java b/src/gov/nasa/worldwind/ogc/kml/KMLParserContext.java index fdcfc41584..515b902b98 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLParserContext.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLParserContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLPhotoOverlay.java b/src/gov/nasa/worldwind/ogc/kml/KMLPhotoOverlay.java index ecc4cb7da4..bbb44bbd65 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLPhotoOverlay.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLPhotoOverlay.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLPlacemark.java b/src/gov/nasa/worldwind/ogc/kml/KMLPlacemark.java index 66a3cf9bb5..c0f69e552b 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLPlacemark.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLPlacemark.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLPoint.java b/src/gov/nasa/worldwind/ogc/kml/KMLPoint.java index 090b7ef553..30e9b715be 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLPoint.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLPoint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLPolyStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLPolyStyle.java index e3d145eae3..69127e8aee 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLPolyStyle.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLPolyStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLPolygon.java b/src/gov/nasa/worldwind/ogc/kml/KMLPolygon.java index 0d29d8af82..be883b5284 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLPolygon.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLPolygon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLRegion.java b/src/gov/nasa/worldwind/ogc/kml/KMLRegion.java index dcebeae53d..8ee9ed4c1e 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLRegion.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLRegion.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -19,11 +41,10 @@ /** * Represents the KML Region element and provides access to its contents. Regions define an area of interest * described by a geographic bounding box and an optional minimum and maximum altitude. - *

        - * Bounding Box
        A Region's bounding box controls when the Region is active by defining a volume + *

        + * Bounding Box
        A Region's bounding box controls when the Region is active by defining a volume * that must intersect the viewing frustum. The bounding box is computed according to the altitudeMode * attribute of a Region's geographic LatLonAltBox as follows: - *

        *

        • clampToGround (default): The bounding box encloses the terrain surface in the sector * defined by the north, south, east, and west limits of this Region's LatLonAltBox.
        • *
        • relativeToGround: The bounding box encloses the volume in the sector defined by the north, @@ -32,11 +53,10 @@ * bounding box encloses the volume in the sector defined by the north, south, east, and west limits of the Region's * LatLonAltBox, and who's upper and lower altitude are specified by its minAltitude and maxAltitude, * relative to mean sea level.
        - *

        - * Level of Detail
        A Region's level of detail determines when it is active by defining an upper + *

        + * Level of Detail
        A Region's level of detail determines when it is active by defining an upper * and lower boundary on the Region's screen area or the Region's distance to the view. The level of detail is computed * according to the altitudeMode attribute of a Region's geographic LatLonAltBox as follows: - *

        *

        • clampToGround (default): The level of detail is determined by computing the distance from * the eye point and Region sector, scaling the distance by the KMLTraversalContext's detail hint, then * comparing that scaled distance to the Region's min and max pixel sizes in meters (the Region sector's area divided by @@ -50,24 +70,24 @@ * level of detail is determined by computing the number of pixels the Region occupies on screen, and comparing that * pixel count to the Region's minLodPixels and maxLodPixels. The Region is active when the * pixel count is greater or equal to minLodPixels and less than maxLodPixels.
        - *

        + *

        * In order to prevent Regions with adjacent level of detail ranges from activating at the same time, Region gives * priority to higher level of detail ranges. For example, suppose that two KML features representing different detail * levels of a Collada model have Regions with LOD range 100-200 and 200-300. Region avoids activating both features in * the event that both their level of detail criteria are met by giving priority to the second range: 200-300. - *

        - * KML Feature Hierarchies
        When a Region is attached to a KML feature, the feature and its + *

        + * KML Feature Hierarchies
        When a Region is attached to a KML feature, the feature and its * descendants are displayed only when the Region is active. A Region is active when its bounding box is in view and its * level of detail criteria are met. Region provides the isActive method for determining if a Region is * active for a specified DrawContext. - *

        + *

        * Regions do not apply directly to KML containers, because a descendant feature can override the container's Region * with its own Region. If a feature does not specify a Region it inherits the Region of its nearest ancestor. Since a * child feature's Region may be larger or have a less restrictive level of detail range than its ancestor's Region, the * visibility of an entire KML feature tree cannot be determined based on a container's Region. Instead, visibility must * be determined at each leaf feature. - *

        - * Limitations
        The Region bounding box must lie between -90 to 90 degrees latitude, and -180 to + *

        + * Limitations
        The Region bounding box must lie between -90 to 90 degrees latitude, and -180 to * 180 degrees longitude. Regions that span the date line are currently not supported. * * @author tag @@ -94,33 +114,33 @@ public class KMLRegion extends KMLAbstractObject /** * RegionData holds a Region's computed data used during a single call to Region.isActive, * and is unique to a particular Globe. - *

        + *

        * RegionData entries are places in a Region's regionDataCache, and are retrieved during each call to * isActive using the current Globe as the cache key. RegionData's elements depend on the * Globe's ElevationModel, and therefore cannot be permanently cached. Each RegionData * entry is valid for a random amount of time between its minExpiryTime and its * maxExpiryTime, after which it must be regenerated. The time is randomized to amortize the cost of * regenerating data for multiple Regions over multiple frames. - *

        - * isActive
        RegionData's isActive property indicates whether the Region + *

        + * isActive
        RegionData's isActive property indicates whether the Region * associated with a RegionData entry is active. This is used to share the result of computing isActive * among multiple calls during the same frame. For example, the preRender and render passes need not each compute * isActive, and can therefore share the same computation by ensuring that this property is set at most * once per frame. Callers determine when to recompute isActive by comparing the * DrawContext's current frame number against the RegionData's activeFrameNumber. This * property is accessed by calling isActive and setActive. - *

        - * extent
        RegionData's extent property is an Extent used to + *

        + * extent
        RegionData's extent property is an Extent used to * determine if a Region's bounding box is in view. This property is accessed by calling getExtent and * setExtent. May be null. - *

        - * sector
        RegionData's sector property is a Sector used to + *

        + * sector
        RegionData's sector property is a Sector used to * determine if Regions with an altitudeMode of clampToGround are in view. Accessed by * calling getSector and setSector. When a Region's altitudeMode is * clampToGround, the Region's sector can be used to determine visibility because the Region is defined * to be on the Globe's surface. - *

        - * points
        RegionData's points property indicates a list of model-coordinate + *

        + * points
        RegionData's points property indicates a list of model-coordinate * points representing the corners and interior of the Region. These points are used to determine the distance * between the Region and the View's eye point. If the Region has altitude mode of * clampToGround, this list must contain five points: the model-coordinate points of the Region's four @@ -289,7 +309,7 @@ public List getPoints() * Specifies the model-coordinate points representing the corners and interior of this entry's Region. These * points are used to determine the distance between this entry's Region and the View's eye point. * Specify null to indicate that this entry' Region has no geographic bounding box. - *

        + *

        * If this entry's Region has altitude mode clampToGround, this list must contain five points: the * model-coordinate points of the Region's four corners and center point on the surface terrain. * @@ -370,7 +390,7 @@ public KMLLod getLod() * Indicates whether this Region is active on the specified DrawContext. A Region is active if its * bounding box intersects the viewing frustum, and its level of detail criteria are met for the specified traversal * context and draw context. - *

        + *

        * This always returns true if this Region has no bounding box, or if its bounding box is in the * viewing frustum and this Region has no lod criteria. * @@ -476,7 +496,7 @@ protected RegionData createCacheEntry(DrawContext dc) /** * Indicates whether this Region's data must be recomputed, either as a result of a change in the * Globe's state or the expiration of the geometry regeneration interval. - *

        + *

        * A {@link gov.nasa.worldwind.ogc.kml.KMLRegion.RegionData} must be current when this method is * called. * @@ -703,7 +723,7 @@ protected boolean isRegionVisible(DrawContext dc) /** * Indicates whether this Region intersects the viewing frustum for the specified DrawContext. A * {@link gov.nasa.worldwind.ogc.kml.KMLRegion.RegionData} must be current when this method is called. - *

        + *

        * This returns true if this Region has no bounding box, or if its bounding box cannot be computed for * any reason. * @@ -727,7 +747,7 @@ protected boolean intersectsFrustum(DrawContext dc) /** * Indicates whether the specified DrawContext meets this Region's level of detail criteria. A * {@link gov.nasa.worldwind.ogc.kml.KMLRegion.RegionData} must be current when this method is called. - *

        + *

        * This returns true if this Region has no level of criteria, or if its level of detail cannot be * compared against the bounding box for any reason. * diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLResourceMap.java b/src/gov/nasa/worldwind/ogc/kml/KMLResourceMap.java index f4a76c70f8..90db7c9e66 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLResourceMap.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLResourceMap.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLRoot.java b/src/gov/nasa/worldwind/ogc/kml/KMLRoot.java index f6301165a4..38f6bf29bf 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLRoot.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLRoot.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -132,7 +154,7 @@ else if (docSource instanceof String) * a {@link InputStream}, or a {@link String} identifying either a file path or a URL. For all types other than * InputStream an attempt is made to determine whether the source is KML or KMZ; KML is assumed if the * test is not definitive. Null is returned if the source type is not recognized. - *

        + *

        * Note: Because there are so many incorrectly formed KML files in distribution, it's often not possible to parse * with a namespace aware parser. This method first tries to use a namespace aware parser, but if a severe problem * occurs during parsing, it will try again using a namespace unaware parser. Namespace unaware parsing typically @@ -490,7 +512,7 @@ protected KMLParserContext createParserContext(XMLEventReader reader) /** * Specifies the object to receive notifications of important occurrences during parsing, such as exceptions and the * occurrence of unrecognized element types. - *

        + *

        * The default notification listener writes a message to the log, and otherwise does nothing. * * @param listener the listener to receive notifications. Specify null to indicate no listener. @@ -547,13 +569,13 @@ public String getSupportFilePath(String link) throws IOException /** * Resolves a reference to a remote or local element of the form address#identifier, where "address" identifies a * local or remote document, including the current document, and and "identifier" is the id of the desired element. - *

        + *

        * If the address part identifies the current document, the document is searched for the specified identifier. * Otherwise the document is retrieved, opened and searched for the identifier. If the address refers to a remote * document and the document has not previously been retrieved and cached locally, retrieval is initiated and this * method returns null. Once the document is successfully retrieved, subsequent calls to this method * return the identified element, if it exists. - *

        + *

        * If the link does not contain an identifier part, this initiates a retrieval for document referenced by the * address part and returns null. Once the document is retrieved this opens the the document as a * KMLRoot. Subsequent calls to this method return the opened document, if it exists. @@ -577,7 +599,7 @@ public Object resolveReference(String link) if (absentResourceList.isResourceAbsent(link)) return null; - // Store remote files in the World Wind cache by default. This provides backward compatibility with applications + // Store remote files in the WorldWind cache by default. This provides backward compatibility with applications // depending on resolveReference's behavior prior to the addition of the cacheRemoteFile parameter. Object o = this.resolveReference(link, true); @@ -592,24 +614,24 @@ public Object resolveReference(String link) /** * Resolves a reference to a remote or local element of the form address#identifier, where "address" identifies a * local or remote document, including the current document, and and "identifier" is the id of the desired element. - *

        + *

        * If the address part identifies the current document, the document is searched for the specified identifier. * Otherwise the document is retrieved, opened and searched for the identifier. If the address refers to a remote * document and the document has not previously been retrieved and cached locally, retrieval is initiated and this * method returns null. Once the document is successfully retrieved, subsequent calls to this method * return the identified element, if it exists. - *

        + *

        * If the link does not contain an identifier part, this initiates a retrieval for document referenced by the * address part and returns null. Once the document is retrieved this opens the the document as a * KMLRoot. Subsequent calls to this method return the opened document, if it exists. - *

        + *

        * The cacheRemoteFile parameter specifies whether to store a retrieved remote document in the World * Wind cache or in a temporary location. This parameter has no effect if the document exists locally. The temporary * location for a retrieved document does not persist between runtime sessions, and subsequent invocations of this * method may not return the same temporary location. * * @param link the document address in the form address#identifier. - * @param cacheRemoteFile true to store remote documents in the World Wind cache, or false + * @param cacheRemoteFile true to store remote documents in the WorldWind cache, or false * to store remote documents in a temporary location. Has no effect if the address is a local * document. * @@ -678,11 +700,11 @@ public Object resolveReference(String link, boolean cacheRemoteFile) /** * Resolves a reference to a local element identified by address and identifier, where {@code linkBase} identifies a * document, including the current document, and {@code linkRef} is the id of the desired element. - *

        + *

        * If {@code linkBase} refers to a local KML or KMZ file and {@code linkRef} is non-null, the return value is the * element identified by {@code linkRef}. If {@code linkRef} is null, the return value is a parsed {@link KMLRoot} * for the KML file identified by {@code linkBase}. - *

        + *

        * If {@code linkBase} refers a local file that is not a KML or KMZ file then {@code linkBase} is returned. If * {@code linkBase} cannot be resolved to a local file then null is returned. * @@ -738,7 +760,7 @@ public Object resolveLocalReference(String linkBase, String linkRef) * Resolves a reference to a remote element identified by address and identifier, where {@code linkBase} identifies * a remote document, and {@code linkRef} is the id of the desired element. This method retrieves resources * asynchronously using the {@link gov.nasa.worldwind.cache.FileStore}. - *

        + *

        * The return value is null if the file is not yet available in the FileStore. If {@code linkBase} refers to a KML * or KMZ file and {@code linkRef} is non-null, the return value is the element identified by {@code linkRef}. If * {@code linkBase} refers to a KML or KMZ and {@code linkRef} is null, the return value is a parsed {@link KMLRoot} @@ -762,7 +784,7 @@ public Object resolveRemoteReference(String linkBase, String linkRef) throw new IllegalArgumentException(message); } - // Store remote files in the World Wind cache by default. This provides backward compatibility with applications + // Store remote files in the WorldWind cache by default. This provides backward compatibility with applications // depending on resolveRemoteReference's behavior prior to the addition of the cacheRemoteFile parameter. return this.resolveRemoteReference(linkBase, linkRef, true); } @@ -771,21 +793,21 @@ public Object resolveRemoteReference(String linkBase, String linkRef) * Resolves a reference to a remote element identified by address and identifier, where {@code linkBase} identifies * a remote document, and {@code linkRef} is the id of the desired element. This method retrieves resources * asynchronously using the {@link gov.nasa.worldwind.cache.FileStore}. - *

        + *

        * The return value is null if the file is not yet available in the FileStore. If {@code linkBase} refers to a KML * or KMZ file and {@code linkRef} is non-null, the return value is the element identified by {@code linkRef}. If * {@code linkBase} refers to a KML or KMZ and {@code linkRef} is null, the return value is a parsed {@link KMLRoot} * for the KML file identified by {@code linkBase}. Otherwise the return value is a {@link URL} to the file in the * file cache or a temporary location, depending on the value of cacheRemoteFile. - *

        - * The cacheRemoteFile parameter specifies whether to store a retrieved remote file in the World Wind + *

        + * The cacheRemoteFile parameter specifies whether to store a retrieved remote file in the WorldWind * cache or in a temporary location. This parameter has no effect if the file exists locally. The temporary location * for a retrieved file does not persist between runtime sessions, and subsequent invocations of this method may not * return the same temporary location. * * @param linkBase the address of the document containing the requested element. * @param linkRef the element's identifier. - * @param cacheRemoteFile true to store remote files in the World Wind cache, or false to + * @param cacheRemoteFile true to store remote files in the WorldWind cache, or false to * store remote files in a temporary location. Has no effect if the address is a local file. * * @return URL to the requested file, parsed KMLRoot, or KML feature. Returns null if the document is not yet @@ -863,17 +885,17 @@ public Object resolveRemoteReference(String linkBase, String linkRef, boolean ca /** * Resolves a NetworkLink to a local or remote KML document. This method retrieves remote resources asynchronously * using the {@link gov.nasa.worldwind.cache.FileStore}. - *

        + *

        * The return value is a parsed KMLRoot representing the linked document. The return value is null if the linked * file is not a KML file, or is not yet available in the FileStore. - *

        - * The cacheRemoteFile parameter specifies whether to store a retrieved remote file in the World Wind + *

        + * The cacheRemoteFile parameter specifies whether to store a retrieved remote file in the WorldWind * cache or in a temporary location. This parameter has no effect if the file exists locally. The temporary location * for a retrieved file does not persist between runtime sessions, and subsequent invocations of this method may not * return the same temporary location. * * @param link the address to resolve - * @param cacheRemoteFile true to store remote files in the World Wind cache, or false to + * @param cacheRemoteFile true to store remote files in the WorldWind cache, or false to * store remote files in a temporary location. Has no effect if the address is a local file. * @param updateTime the time at which the link was last updated. If a cached file exists for the specified * resource, the file must have been retrieved after the link update time. Otherwise, the @@ -1207,7 +1229,7 @@ public double getDetailHint() * detail to appear at higher resolution at greater distances than normal, but at an increased performance cost. * Values less than 0 decrease the default resolution at any given distance. The default value is 0. Values * typically range between -0.5 and 0.5. - *

        + *

        * The top level KML root's detail hint is inherited by all KML elements beneath that root, including any descendant * KML roots loaded by network links. If this KML root has been loaded by a network link, its detail hint is * ignored. @@ -1245,7 +1267,7 @@ public void render(KMLTraversalContext tc, DrawContext dc) /** * {@inheritDoc} - *

        + *

        * Overridden to forward the message to the root feature. * * @param msg The message that was received. diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLScale.java b/src/gov/nasa/worldwind/ogc/kml/KMLScale.java index deb703f12d..6781f46fa4 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLScale.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLScale.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLSchema.java b/src/gov/nasa/worldwind/ogc/kml/KMLSchema.java index d80edffb3b..9ef19ba301 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLSchema.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLSchema.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLSchemaData.java b/src/gov/nasa/worldwind/ogc/kml/KMLSchemaData.java index b98f6d839b..1a8f9658fb 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLSchemaData.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLSchemaData.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLScreenOverlay.java b/src/gov/nasa/worldwind/ogc/kml/KMLScreenOverlay.java index 55816729f8..57983635a2 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLScreenOverlay.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLScreenOverlay.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLSimpleData.java b/src/gov/nasa/worldwind/ogc/kml/KMLSimpleData.java index 98067c0aad..1c68c355cb 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLSimpleData.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLSimpleData.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLSimpleField.java b/src/gov/nasa/worldwind/ogc/kml/KMLSimpleField.java index c8a3ff3b76..64fa92ea18 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLSimpleField.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLSimpleField.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLSnippet.java b/src/gov/nasa/worldwind/ogc/kml/KMLSnippet.java index fad12ef5b0..41c8f1e35b 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLSnippet.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLSnippet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLStyle.java b/src/gov/nasa/worldwind/ogc/kml/KMLStyle.java index 2f2f182a74..c4eaa3037d 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLStyle.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLStyleMap.java b/src/gov/nasa/worldwind/ogc/kml/KMLStyleMap.java index 89893464c2..f93ae6a49a 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLStyleMap.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLStyleMap.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -102,7 +124,7 @@ public KMLStyleUrl getStyleUrlFromMap(String styleState) * Obtains the map's effective style for a specified style type (IconStyle, ListStyle, etc.) and state * (normal or highlight). The returned style is the result of merging values from the map's style * selectors and style URL for the indicated sub-style type, with precedence given to style selectors. - *

        + *

        * Remote styleUrls that have not yet been resolved are not included in the result. In this case the returned * sub-style is marked with the value {@link gov.nasa.worldwind.avlist.AVKey#UNRESOLVED}. * diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLStyleUrl.java b/src/gov/nasa/worldwind/ogc/kml/KMLStyleUrl.java index 46f392d4ae..c651a86e11 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLStyleUrl.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLStyleUrl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; @@ -27,7 +49,7 @@ public KMLStyleUrl(String namespaceURI) /** * Resolves a styleUrl to a style selector, which is either a style or style map. - *

        + *

        * If the url refers to a remote resource and the resource has not been retrieved and cached locally, this method * returns null and initiates a retrieval. * diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLTimeSpan.java b/src/gov/nasa/worldwind/ogc/kml/KMLTimeSpan.java index 9886c471e9..c6af5d88c2 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLTimeSpan.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLTimeSpan.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLTimeStamp.java b/src/gov/nasa/worldwind/ogc/kml/KMLTimeStamp.java index 614783cbf0..1a468938df 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLTimeStamp.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLTimeStamp.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLUpdate.java b/src/gov/nasa/worldwind/ogc/kml/KMLUpdate.java index bf76604899..de7f5ab7e1 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLUpdate.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLUpdate.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLUpdateOperation.java b/src/gov/nasa/worldwind/ogc/kml/KMLUpdateOperation.java index 57189a882c..12133f1820 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLUpdateOperation.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLUpdateOperation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLVec2.java b/src/gov/nasa/worldwind/ogc/kml/KMLVec2.java index e30ca7304c..840f3f742c 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLVec2.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLVec2.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/KMLViewVolume.java b/src/gov/nasa/worldwind/ogc/kml/KMLViewVolume.java index e57470f4b7..15d950f341 100644 --- a/src/gov/nasa/worldwind/ogc/kml/KMLViewVolume.java +++ b/src/gov/nasa/worldwind/ogc/kml/KMLViewVolume.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXAbstractTourPrimitive.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXAbstractTourPrimitive.java index b5ef576d3a..950587c08e 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXAbstractTourPrimitive.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXAbstractTourPrimitive.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXAnimatedUpdate.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXAnimatedUpdate.java index 68e0895d64..9dd6e2669b 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXAnimatedUpdate.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXAnimatedUpdate.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXConstants.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXConstants.java index 5e7284b4bf..166d198f5b 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXConstants.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXConstants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXFlyTo.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXFlyTo.java index 2f64e14b4a..02de3f0409 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXFlyTo.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXFlyTo.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXLatLongQuad.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXLatLongQuad.java index 2d3b87484f..71af8dd1f5 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXLatLongQuad.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXLatLongQuad.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXParserContext.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXParserContext.java index 5920f97580..ebdd49dae6 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXParserContext.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXParserContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXPlaylist.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXPlaylist.java index 19c9f2ecc4..33ec7fa537 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXPlaylist.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXPlaylist.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXSoundCue.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXSoundCue.java index 404cd1024c..ee0bb4b88a 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXSoundCue.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXSoundCue.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXTour.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXTour.java index 034692bb72..443640b687 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXTour.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXTour.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXTourControl.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXTourControl.java index 151019c5cf..c3a10258c9 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXTourControl.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXTourControl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/GXWait.java b/src/gov/nasa/worldwind/ogc/kml/gx/GXWait.java index 68f4bca67a..994d83ecbf 100644 --- a/src/gov/nasa/worldwind/ogc/kml/gx/GXWait.java +++ b/src/gov/nasa/worldwind/ogc/kml/gx/GXWait.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/package-info.java b/src/gov/nasa/worldwind/ogc/kml/gx/package-info.java new file mode 100644 index 0000000000..867c11a163 --- /dev/null +++ b/src/gov/nasa/worldwind/ogc/kml/gx/package-info.java @@ -0,0 +1,34 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for parsing the Google GX KML extensions.

        + * + */ +package gov.nasa.worldwind.ogc.kml.gx; diff --git a/src/gov/nasa/worldwind/ogc/kml/gx/package.html b/src/gov/nasa/worldwind/ogc/kml/gx/package.html deleted file mode 100644 index 15ff4f6428..0000000000 --- a/src/gov/nasa/worldwind/ogc/kml/gx/package.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - KML Parser Package - - -

        Provides classes for parsing the Google GX KML extensions.

        - - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLAbstractBalloon.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLAbstractBalloon.java index 5612cfe388..cc5f1bfdba 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLAbstractBalloon.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLAbstractBalloon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -26,11 +48,10 @@ * implementing the Balloon interface, this class provides a thin wrapper around another Balloon implementation and adds * the logic for styling the Balloon according to the KML style. All Balloon methods on this class pass through to the * contained Balloon. - *

        + *

        * To use KML Balloon, first create a Balloon of the desired type, and then create the KML Balloon. For example: - *

        - * *

        + * 
          *   KMLPlacemark myPlacemark = ...;
          *   Position placemarkPosition = ...;
          *
        @@ -39,8 +60,8 @@
          *
          *   // Create a KML Balloon to apply the placemark's KML BalloonStyle to the browser balloon.
          *   KMLGlobeBalloonImpl kmlBalloon = new KMLGlobeBalloonImpl(globeBalloon, myPlacemark);
        - * 
        * + *
        * * @author pabercrombie * @version $Id: KMLAbstractBalloon.java 1555 2013-08-20 13:33:12Z pabercrombie $ @@ -84,6 +105,7 @@ public KMLAbstractBalloon(KMLAbstractFeature feature) * * @param balloon The balloon contained in this wrapper object. */ + @SuppressWarnings("deprecation") protected void initialize(Balloon balloon) { balloon.setTextDecoder(this.createTextDecoder(this.parent)); @@ -339,7 +361,7 @@ protected boolean mustAddHyperlinks(String text) /** * Add hyperlink tags to URLs in the balloon text. The text may include some simple HTML markup. This method * attempts to identify URLs in the text while not altering URLs that are already linked. - *

        + *

        * This method is conservative about what is identified as a URL, in order to avoid adding links to text that the * user did not intend to be linked. Only HTTP and HTTPS URLs are recognised, as well as text that begins with www. * (in which case a http:// prefix will be prepended). Some punctuation characters that are valid URL characters @@ -486,12 +508,12 @@ public void setDisplayMode(String displayMode) /** * {@inheritDoc} - *

        + *

        * This implementation resolves relative resource paths by calling {@link * gov.nasa.worldwind.ogc.kml.io.KMLDoc#getSupportFilePath(String)} on the parent * KMLAbstractFeature's KMLDoc. This is necessary to correctly resolve relative references * in a KMZ archive. - *

        + *

        * This returns null if the specified address is null. */ public URL resolve(String address) diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLBalloonTextDecoder.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLBalloonTextDecoder.java index e8d71afd3f..960872da96 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLBalloonTextDecoder.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLBalloonTextDecoder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLController.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLController.java index 6d108435d1..4c7ba2c2a4 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLController.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -12,7 +34,7 @@ import gov.nasa.worldwind.render.*; /** - * Executes the mapping from KML to World Wind. Traverses a parsed KML document and creates the appropriate World Wind + * Executes the mapping from KML to WorldWind. Traverses a parsed KML document and creates the appropriate WorldWind * object to represent the KML. * * @author tag diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLExportUtil.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLExportUtil.java index 3496f87ba4..c7b44036f8 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLExportUtil.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLExportUtil.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -169,7 +191,7 @@ else if (Size.EXPLICIT_DIMENSION.equals(sizeMode)) * * @param hexString String to manipulate. * - * @return The portion of {@code hexString} after the 0X. For example: "0X00FF00" => "00FF00". If the string does + * @return The portion of {@code hexString} after the 0X. For example: "0X00FF00" => "00FF00". If the string does * not begin with 0X, {@code hexString} is returned. The comparison is not case sensitive. */ public static String stripHexPrefix(String hexString) diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLExtrudedPolygonImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLExtrudedPolygonImpl.java index a831afd34a..6e8c966bc3 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLExtrudedPolygonImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLExtrudedPolygonImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLGlobeBalloonImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLGlobeBalloonImpl.java index 66aa59fe65..2d350b5c1c 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLGlobeBalloonImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLGlobeBalloonImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLGroundOverlayPolygonImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLGroundOverlayPolygonImpl.java index 715b766a2c..1c26d4d47a 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLGroundOverlayPolygonImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLGroundOverlayPolygonImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLLineStringPlacemarkImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLLineStringPlacemarkImpl.java index 81e8c3c130..4d5bb27ec1 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLLineStringPlacemarkImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLLineStringPlacemarkImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLModelPlacemarkImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLModelPlacemarkImpl.java index 43b6be9836..2ca4fcce1e 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLModelPlacemarkImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLModelPlacemarkImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -217,7 +239,7 @@ public void render(KMLTraversalContext tc, DrawContext dc) * resources will be resolved relative to the .dae file within the archive. Normally references in a KMZ are * resolved relative to the root of the archive, but Model references are an exception. See * https://developers.google.com/kml/documentation/kmzarchives and https://developers.google.com/kml/documentation/kmlreference#model - *

        + *

        * {@inheritDoc}. */ public String resolveFilePath(String path) throws IOException @@ -296,14 +318,15 @@ protected void requestResource(DrawContext dc) } /** - * Initiates a retrieval of the model referenced by this placemark. Once the resource is retrieved and loaded, this + * Initiates a retrieval of the model referenced by this placemark.Once the resource is retrieved and loaded, this * calls {@link #setColladaRoot(ColladaRoot)} to specify this link's new network resource, and sends an * {@link gov.nasa.worldwind.avlist.AVKey#RETRIEVAL_STATE_SUCCESSFUL} property change event to this - * link's property change listeners. - *

        + * link's property change listeners.

        * This does nothing if this KMLNetworkLink has no KMLLink. * * @param address the address of the resource to retrieve + * @throws java.io.IOException if a reading error occurs. + * @throws javax.xml.stream.XMLStreamException if a parsing error occurs. */ protected void retrieveModel(String address) throws IOException, XMLStreamException { diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLPointPlacemarkImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLPointPlacemarkImpl.java index 6f87f6b187..a2ca596378 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLPointPlacemarkImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLPointPlacemarkImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLPolygonImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLPolygonImpl.java index 3b4acf2c6d..2f7375b018 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLPolygonImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLPolygonImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLRenderable.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLRenderable.java index b0de297d9d..591965e750 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLRenderable.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLRenderable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenBalloonImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenBalloonImpl.java index 5762cfbf52..c48a4a27d8 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenBalloonImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenBalloonImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenImageImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenImageImpl.java index 4db0f7a093..ed5818e851 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenImageImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenImageImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -188,9 +210,8 @@ protected BasicWWTexture initializeTexture() /** * Get the size mode for a size parameter. The KML size tag takes a numeric size attribute, but certain values of * this attribute change the interpretation of the tag. - *

        - *

        • A value of -1 indicates to use the native dimension
        • .
        • A value of 0 indicates to maintain the - * aspect ratio
        • .
        • A value of n sets the value of the dimension
        • .
        + *
        • A value of -1 indicates to use the native dimension.
        • A value of 0 indicates to maintain the + * aspect ratio.
        • A value of n sets the value of the dimension.
        * * @param size The KML size attribute * diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfaceImageImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfaceImageImpl.java index 404282567d..385adca969 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfaceImageImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfaceImageImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfacePolygonImpl.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfacePolygonImpl.java index a16b336e33..72aab1ec01 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfacePolygonImpl.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLSurfacePolygonImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -61,7 +83,7 @@ public KMLSurfacePolygonImpl(KMLTraversalContext tc, KMLPlacemark placemark, KML KMLPolygon polygon = (KMLPolygon) geom; - // KMLPolygon's use linear interpolation between corners by definition. Configure the World Wind SurfacePolygon + // KMLPolygon's use linear interpolation between corners by definition. Configure the WorldWind SurfacePolygon // to use the appropriate path type for linear interpolation in geographic coordinates. this.setPathType(AVKey.LINEAR); diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLTraversalContext.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLTraversalContext.java index 154b905e3e..92e3e34c79 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLTraversalContext.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLTraversalContext.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; diff --git a/src/gov/nasa/worldwind/ogc/kml/impl/KMLUtil.java b/src/gov/nasa/worldwind/ogc/kml/impl/KMLUtil.java index fb9fafb942..1714d51a01 100644 --- a/src/gov/nasa/worldwind/ogc/kml/impl/KMLUtil.java +++ b/src/gov/nasa/worldwind/ogc/kml/impl/KMLUtil.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.impl; @@ -113,7 +135,7 @@ else if (KML_INSET_PIXELS.equals(units)) * Translate a WorldWind units constant ({@link AVKey#PIXELS}, {@link AVKey#INSET_PIXELS}, or {@link AVKey#FRACTION} * to the corresponding KML unit string ("pixels", "insetPixels", or "fraction"). * - * @param units World Wind units to translate. + * @param units WorldWind units to translate. * * @return KML units, or null if the argument is not a valid WW unit. */ diff --git a/src/gov/nasa/worldwind/ogc/kml/io/KMLDoc.java b/src/gov/nasa/worldwind/ogc/kml/io/KMLDoc.java index 88f2d16bb7..5ecff9e84b 100644 --- a/src/gov/nasa/worldwind/ogc/kml/io/KMLDoc.java +++ b/src/gov/nasa/worldwind/ogc/kml/io/KMLDoc.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.io; @@ -20,7 +42,7 @@ public interface KMLDoc /** * Returns an {@link InputStream} to the associated KML document within either a KML file or stream or a KMZ file or * stream. - *

        + *

        * Implementations of this interface do not close the stream; the user of the class must close the stream. * * @return an input stream positioned to the head of the KML document. diff --git a/src/gov/nasa/worldwind/ogc/kml/io/KMLFile.java b/src/gov/nasa/worldwind/ogc/kml/io/KMLFile.java index 402a2bdf0f..6120925292 100644 --- a/src/gov/nasa/worldwind/ogc/kml/io/KMLFile.java +++ b/src/gov/nasa/worldwind/ogc/kml/io/KMLFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.io; @@ -12,7 +34,7 @@ /** * Implements the {@link KMLDoc} interface for KML files located within a computer's file system. - *

        + *

        * Note: This class does not resolve references to files in KMZ archives. For example, it does not resolve references * like this: ../other.kmz/file.png. * diff --git a/src/gov/nasa/worldwind/ogc/kml/io/KMLInputStream.java b/src/gov/nasa/worldwind/ogc/kml/io/KMLInputStream.java index 54a609b1fd..f856fed329 100644 --- a/src/gov/nasa/worldwind/ogc/kml/io/KMLInputStream.java +++ b/src/gov/nasa/worldwind/ogc/kml/io/KMLInputStream.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.io; diff --git a/src/gov/nasa/worldwind/ogc/kml/io/KMZFile.java b/src/gov/nasa/worldwind/ogc/kml/io/KMZFile.java index d9101744ff..a8a6511df6 100644 --- a/src/gov/nasa/worldwind/ogc/kml/io/KMZFile.java +++ b/src/gov/nasa/worldwind/ogc/kml/io/KMZFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.io; @@ -14,7 +36,7 @@ /** * Implements the {@link KMLDoc} interface for KMZ files located within a computer's file system. - *

        + *

        * Note: This class does not yet resolve references to files in other KMZ archives. For example, it does not resolve * references like this: ../other.kmz/file.png. * @@ -87,7 +109,7 @@ public synchronized InputStream getKMLStream() throws IOException /** * Returns an {@link InputStream} to a specified file within the KMZ file. The file's path is resolved relative to * the internal root of the KMZ file. - *

        + *

        * Note: This class does not yet resolve references to files in other KMZ archives. For example, it does not resolve * references like this: ../other.kmz/file.png. * @@ -128,7 +150,7 @@ public synchronized InputStream getSupportFileStream(String path) throws IOExcep /** * Returns an absolute path to a specified file within the KMZ file. The file's path is resolved relative to the * internal root of the KMZ file. - *

        + *

        * Note: This class does not yet resolve references to files in other KMZ archives. For example, it does not resolve * references like this: ../other.kmz/file.png. // TODO * diff --git a/src/gov/nasa/worldwind/ogc/kml/io/KMZInputStream.java b/src/gov/nasa/worldwind/ogc/kml/io/KMZInputStream.java index d8af151abd..e01fb01ca8 100644 --- a/src/gov/nasa/worldwind/ogc/kml/io/KMZInputStream.java +++ b/src/gov/nasa/worldwind/ogc/kml/io/KMZInputStream.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.kml.io; @@ -110,7 +132,7 @@ public synchronized InputStream getKMLStream() throws IOException /** * Returns an {@link InputStream} to a specified file within the KMZ stream. The file's path is resolved relative to * the internal root of the KMZ file represented by the stream. - *

        + *

        * Note: Since relative references to files outside the stream have no meaning, this class does not resolve relative * references to files in other KMZ archives. For example, it does not resolve references like this: * ../other.kmz/file.png. @@ -157,7 +179,7 @@ public synchronized InputStream getSupportFileStream(String path) throws IOExcep /** * Returns an absolute path to a specified file within the KMZ stream. The file's path is resolved relative to the * internal root of the KMZ file represented by the stream. - *

        + *

        * Note: Since relative references to files outside the stream have no meaning, this class does not resolve relative * references to files in other KMZ archives. For example, it does not resolve references like this: * ../other.kmz/file.png. @@ -205,7 +227,7 @@ public synchronized String getSupportFilePath(String path) throws IOException /** * Copies a file from the input stream to the temporary area created to represent the KMZ contents. If that area * does not yet exists, it is created. - *

        + *

        * Note: This method should be called only by another synchronized method of this instance. * * @throws IOException if an error occurs during the copy. diff --git a/src/gov/nasa/worldwind/ogc/kml/io/package-info.java b/src/gov/nasa/worldwind/ogc/kml/io/package-info.java new file mode 100644 index 0000000000..f366eafb17 --- /dev/null +++ b/src/gov/nasa/worldwind/ogc/kml/io/package-info.java @@ -0,0 +1,34 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for KML and KMZ file and stream I/O and relative-path resolution.

        + * + */ +package gov.nasa.worldwind.ogc.kml.io; diff --git a/src/gov/nasa/worldwind/ogc/kml/io/package.html b/src/gov/nasa/worldwind/ogc/kml/io/package.html deleted file mode 100644 index fbef262f83..0000000000 --- a/src/gov/nasa/worldwind/ogc/kml/io/package.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - KML Parser I/O Package - - -

        Provides classes for KML and KMZ file and stream I/O and relative-path resolution.

        - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/ogc/kml/package-info.java b/src/gov/nasa/worldwind/ogc/kml/package-info.java new file mode 100644 index 0000000000..ea14652485 --- /dev/null +++ b/src/gov/nasa/worldwind/ogc/kml/package-info.java @@ -0,0 +1,78 @@ +/* + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. + */ + +/** + *

        + * Provides classes for parsing KML and KMZ files and streams.

        + *

        How to Parse a KML or KMZ File or Stream

        + *
          + *
        1. + * Create a {@link gov.nasa.worldwind.ogc.kml.KMLRoot} via one of its constructors, such as {@link + * gov.nasa.worldwind.ogc.kml.KMLRoot#KMLRoot(java.io.File)}, passing the KML or KMZ source to the constructor. A + * KMLRoot provides access to the KML contents. The source can be either a file, an input stream or a URL. + *
        2. + *
        3. + * Call {@link gov.nasa.worldwind.ogc.kml.KMLRoot#parse(Object[])} to parse the document. + *
        4. + *
        5. + * The KMLRoot class provides accessor methods for the kml element of the KML file, its root. + * The content includes the element's single attribute, hint, and the NetworkLinkControl and + * Feature elements it may contain. Once the root is parsed, use these methods to obtain objects representing + * these elements, and use the accessor methods of those objects in turn to obtain their contents. + *
        6. + *
        7. + * Each KML element defined in the KML specification has a + * corresponding class provided in this package. Each of those classes contains methods to obtain the element's contents + * as defined by the specification. The same is true for the other specifications KML uses: Atom, XAL and the GX extensions + * defined by Google. Use these classes to obtain the contents of individual elements of the KML file. + *
        8. + *
        + * The classes in this package only read and parse a KML file. Mapping them to shapes, annotations and other WorldWind + * objects is a separate step. WorldWind provides default mappings for many KML elements, but an application is fully + * able to provide its own, and in some cases is expected to. + *

        Extending the Classes

        + * +

        + * This package's classes are designed for easy behavior modification and replacement, and for straightforward addition + * of operations to be performed during parsing. See the description of {@link + * gov.nasa.worldwind.util.xml.AbstractXMLEventParser} for further information.

        + * +

        Relative References

        + * +

        + * Because the KML specification requires relative references within KML files to be resolved relative to the location + * of the file, a context is provided to resolve these references. The context is specific to the document type — + * file, stream, KML or KMZ — and is provided by the {@link gov.nasa.worldwind.ogc.kml.io.KMLDoc} interface and its + * implementing classes. It's available from the {@link gov.nasa.worldwind.ogc.kml.KMLRoot}. See the description of the + * KMLDoc interface for further information.

        + * + */ +package gov.nasa.worldwind.ogc.kml; diff --git a/src/gov/nasa/worldwind/ogc/kml/package.html b/src/gov/nasa/worldwind/ogc/kml/package.html deleted file mode 100644 index 11a339e630..0000000000 --- a/src/gov/nasa/worldwind/ogc/kml/package.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - KML Parser Package - - -

        Provides classes for parsing KML and KMZ files and streams.

        -

        How to Parse a KML or KMZ File or Stream

        -
          -
        1. - Create a {@link gov.nasa.worldwind.ogc.kml.KMLRoot} via one of its constructors, such as {@link - gov.nasa.worldwind.ogc.kml.KMLRoot#KMLRoot(java.io.File)}, passing the KML or KMZ source to the constructor. A - KMLRoot provides access to the KML contents. The source can be either a file, an input stream or a - URL. -
        2. -
        3. - Call {@link gov.nasa.worldwind.ogc.kml.KMLRoot#parse(Object[])} to parse the document. -
        4. -
        5. - The KMLRoot class provides accessor methods for the kml element of the KML file, its - root. The content includes the element's single attribute, hint, and the NetworkLinkControl and - Feature elements it may contain. Once the root is parsed, use these methods to obtain objects - representing these elements, and use the accessor methods of those objects in turn to obtain their contents. -
        6. -
        7. - Each KML element defined in the KML specification has - a corresponding class provided in this package. Each of those classes contains methods to obtain the element's - contents as defined by the specification. The same is true for the other specifications KML uses: Atom, XAL and the GX extensions - defined by Google. Use these classes to obtain the contents of individual elements of the KML file. -
        8. -
        -The classes in this package only read and parse a KML file. Mapping them to shapes, annotations and other World Wind -objects is a separate step. World Wind provides default mappings for many KML elements, but an application is fully able -to provide its own, and in some cases is expected to. -

        Extending the Classes

        - -

        This package's classes are designed for easy behavior modification and replacement, and for straightforward addition - of operations to be performed during parsing. See the description of {@link - gov.nasa.worldwind.util.xml.AbstractXMLEventParser} for further information.

        - -

        Relative References

        - -

        - Because the KML specification requires relative references within KML files to be resolved relative to the location - of the file, a context is provided to resolve these references. The context is specific to the document type — - file, stream, KML or KMZ — and is provided by the {@link gov.nasa.worldwind.ogc.kml.io.KMLDoc} interface and - its implementing classes. It's available from the {@link gov.nasa.worldwind.ogc.kml.KMLRoot}. See the description of - the KMLDoc interface for further information.

        - - \ No newline at end of file diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSAddress.java b/src/gov/nasa/worldwind/ogc/ows/OWSAddress.java index 34e032eaf1..4310441242 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSAddress.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSAddress.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSAllowedValues.java b/src/gov/nasa/worldwind/ogc/ows/OWSAllowedValues.java index 46d2e17625..3752eeeabd 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSAllowedValues.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSAllowedValues.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSCapabilities.java b/src/gov/nasa/worldwind/ogc/ows/OWSCapabilities.java index 938431c9cb..a536d2061e 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSCapabilities.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSCapabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSConstraint.java b/src/gov/nasa/worldwind/ogc/ows/OWSConstraint.java index b87fd5ef5b..489f23565d 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSConstraint.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSConstraint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSContactInfo.java b/src/gov/nasa/worldwind/ogc/ows/OWSContactInfo.java index 738e63a084..46ec48532b 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSContactInfo.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSContactInfo.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSDCP.java b/src/gov/nasa/worldwind/ogc/ows/OWSDCP.java index a5d917e218..3a18d8ce83 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSDCP.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSDCP.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSHTTP.java b/src/gov/nasa/worldwind/ogc/ows/OWSHTTP.java index 8590133de6..00e3527b6c 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSHTTP.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSHTTP.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSOperation.java b/src/gov/nasa/worldwind/ogc/ows/OWSOperation.java index c549c5803e..1d63cf4ae7 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSOperation.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSOperation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSOperationsMetadata.java b/src/gov/nasa/worldwind/ogc/ows/OWSOperationsMetadata.java index f040f55a5a..f36437f1e2 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSOperationsMetadata.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSOperationsMetadata.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSParameter.java b/src/gov/nasa/worldwind/ogc/ows/OWSParameter.java index b0412752d6..5eb092774d 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSParameter.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSParameter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSPhone.java b/src/gov/nasa/worldwind/ogc/ows/OWSPhone.java index eecea53f6a..a341f8d7a9 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSPhone.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSPhone.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSServiceContact.java b/src/gov/nasa/worldwind/ogc/ows/OWSServiceContact.java index 5487d0ac4f..e3cbb882c4 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSServiceContact.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSServiceContact.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSServiceIdentification.java b/src/gov/nasa/worldwind/ogc/ows/OWSServiceIdentification.java index e08b986aad..bbfc5ed3b5 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSServiceIdentification.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSServiceIdentification.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSServiceProvider.java b/src/gov/nasa/worldwind/ogc/ows/OWSServiceProvider.java index 8c1515a51b..62fb835485 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSServiceProvider.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSServiceProvider.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/ows/OWSWGS84BoundingBox.java b/src/gov/nasa/worldwind/ogc/ows/OWSWGS84BoundingBox.java index 2cc49048a9..393f6b408b 100644 --- a/src/gov/nasa/worldwind/ogc/ows/OWSWGS84BoundingBox.java +++ b/src/gov/nasa/worldwind/ogc/ows/OWSWGS84BoundingBox.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.ows; diff --git a/src/gov/nasa/worldwind/ogc/wcs/WCSCapabilities.java b/src/gov/nasa/worldwind/ogc/wcs/WCSCapabilities.java index 015d2e82db..d8bd99610d 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/WCSCapabilities.java +++ b/src/gov/nasa/worldwind/ogc/wcs/WCSCapabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs; diff --git a/src/gov/nasa/worldwind/ogc/wcs/WCSContents.java b/src/gov/nasa/worldwind/ogc/wcs/WCSContents.java index be58976965..2bc690705a 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/WCSContents.java +++ b/src/gov/nasa/worldwind/ogc/wcs/WCSContents.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs; diff --git a/src/gov/nasa/worldwind/ogc/wcs/WCSCoverageSummary.java b/src/gov/nasa/worldwind/ogc/wcs/WCSCoverageSummary.java index fe27bce30d..f799949e96 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/WCSCoverageSummary.java +++ b/src/gov/nasa/worldwind/ogc/wcs/WCSCoverageSummary.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescription.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescription.java index 95aaac0d72..24cfdd6b86 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescription.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescription.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescriptionHolder.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescriptionHolder.java index cb7932afa4..3e41b314ad 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescriptionHolder.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100AxisDescriptionHolder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capabilities.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capabilities.java index da5e498e24..5c310a21a9 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capabilities.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; @@ -33,6 +55,7 @@ public class WCS100Capabilities extends AbstractXMLEventParser * @param uri The URI of the server. * * @return The WCS capabilities document for the specified server. + * @throws java.lang.Exception if a general error occurs. * * @throws IllegalArgumentException if the specified URI is invalid. * @throws gov.nasa.worldwind.exception.WWRuntimeException diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capability.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capability.java index 2caaba5dc4..cf0704c7b0 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capability.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capability.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ContentMetadata.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ContentMetadata.java index 25419fea1f..ff15706519 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ContentMetadata.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ContentMetadata.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOffering.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOffering.java index a408aecf84..00308266c2 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOffering.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOffering.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOfferingBrief.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOfferingBrief.java index e676e6442e..92a61855f6 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOfferingBrief.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100CoverageOfferingBrief.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DCPType.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DCPType.java index 7443a2a00b..1ec5018079 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DCPType.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DCPType.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DescribeCoverage.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DescribeCoverage.java index 70383934a7..1f2ac0ea2f 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DescribeCoverage.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DescribeCoverage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DomainSet.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DomainSet.java index eb308ac147..b4fb5c1315 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DomainSet.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100DomainSet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Exception.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Exception.java index 3e08251847..01ca29b35a 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Exception.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Exception.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100HTTP.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100HTTP.java index 8d39f2a01d..9194361102 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100HTTP.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100HTTP.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Interval.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Interval.java index 4a11d30f1d..6b5aff3421 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Interval.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Interval.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100LonLatEnvelope.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100LonLatEnvelope.java index 83904f0b36..d97e710437 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100LonLatEnvelope.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100LonLatEnvelope.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Max.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Max.java index ff21c405e7..84c298f285 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Max.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Max.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100MetadataLink.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100MetadataLink.java index f27bc26557..68ba83c2a8 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100MetadataLink.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100MetadataLink.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Min.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Min.java index 25d52c6308..577d635f18 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Min.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Min.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSet.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSet.java index 0b168c25ba..043a030acc 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSet.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSet.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSetHolder.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSetHolder.java index 383a1cdc00..a45916e073 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSetHolder.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RangeSetHolder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Request.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Request.java index 0479e286a8..0dfa723cf5 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Request.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Request.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RequestDescription.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RequestDescription.java index 1996418559..64f0009d50 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RequestDescription.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100RequestDescription.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ResponsibleParty.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ResponsibleParty.java index 4fb7c379dc..533c5a7302 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ResponsibleParty.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100ResponsibleParty.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Service.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Service.java index 3ac31f4278..539d5d0fff 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Service.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Service.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SingleValue.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SingleValue.java index d48364edfe..dca3d121f2 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SingleValue.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SingleValue.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SpatialDomain.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SpatialDomain.java index 7941e6b820..2c99706e77 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SpatialDomain.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SpatialDomain.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedCRSs.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedCRSs.java index 7774a7a796..f30352869c 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedCRSs.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedCRSs.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedFormats.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedFormats.java index 722aa61b33..e4bd1f2f57 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedFormats.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedFormats.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedInterpolations.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedInterpolations.java index ecdb47e597..f9106ef42f 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedInterpolations.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100SupportedInterpolations.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Values.java b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Values.java index fd12128e9f..f51b67bc2b 100644 --- a/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Values.java +++ b/src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Values.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wcs.wcs100; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSAuthorityURL.java b/src/gov/nasa/worldwind/ogc/wms/WMSAuthorityURL.java index c5d2457e12..9525dcf1c1 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSAuthorityURL.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSAuthorityURL.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSCapabilities.java b/src/gov/nasa/worldwind/ogc/wms/WMSCapabilities.java index dd434b2a4b..2658e0d175 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSCapabilities.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSCapabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; @@ -33,6 +55,7 @@ public class WMSCapabilities extends OGCCapabilities * @param uri The URI of the server. * * @return The WMS capabilities document for the specified server. + * @throws java.lang.Exception if a general error occurs. * * @throws IllegalArgumentException if the specified URI is invalid. * @throws gov.nasa.worldwind.exception.WWRuntimeException diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSCapabilityInformation.java b/src/gov/nasa/worldwind/ogc/wms/WMSCapabilityInformation.java index 373531aeb1..7306dcd986 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSCapabilityInformation.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSCapabilityInformation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerAttribution.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerAttribution.java index 405abe9a5f..af7abbe0f5 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerAttribution.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerAttribution.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerCapabilities.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerCapabilities.java index 9fcaaf0681..9620cd5149 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerCapabilities.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerCapabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerDimension.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerDimension.java index 1bedaa3922..1628cb3510 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerDimension.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerDimension.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerExtent.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerExtent.java index 30e8b06762..aed2dc9edf 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerExtent.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerExtent.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerIdentifier.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerIdentifier.java index ac10f50cab..7fd0b73c0a 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerIdentifier.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerIdentifier.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerInfoURL.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerInfoURL.java index 095be6b4b7..77d12703fe 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerInfoURL.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerInfoURL.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLayerStyle.java b/src/gov/nasa/worldwind/ogc/wms/WMSLayerStyle.java index 4ca6c876eb..e9dd2fc00c 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLayerStyle.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLayerStyle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSLogoURL.java b/src/gov/nasa/worldwind/ogc/wms/WMSLogoURL.java index 0810eede14..4325a261f1 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSLogoURL.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSLogoURL.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/ogc/wms/WMSServiceInformation.java b/src/gov/nasa/worldwind/ogc/wms/WMSServiceInformation.java index db724c1109..38ce01c407 100644 --- a/src/gov/nasa/worldwind/ogc/wms/WMSServiceInformation.java +++ b/src/gov/nasa/worldwind/ogc/wms/WMSServiceInformation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.ogc.wms; diff --git a/src/gov/nasa/worldwind/pick/PickSupport.java b/src/gov/nasa/worldwind/pick/PickSupport.java index 915af80606..de36c75420 100644 --- a/src/gov/nasa/worldwind/pick/PickSupport.java +++ b/src/gov/nasa/worldwind/pick/PickSupport.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.pick; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.render.DrawContext; import gov.nasa.worldwind.util.Range; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.util.*; @@ -106,7 +128,7 @@ public PickedObject getTopObject(DrawContext dc, Point pickPoint) * Adds picked object registered with this PickSupport that are drawn at the specified pick point or intersect the * draw context's pick rectangle to the draw context's list of picked objects. This clears any registered picked * objects upon returning. - *

        + *

        * If this pick point is null, this ignores the pick point and does not attempt to determine which * picked objects are drawn there. If the draw context's pick rectangle is null, this ignores the pick * rectangle and does not attempt to determine which picked objects intersect it. This does nothing if no picked @@ -208,7 +230,7 @@ protected void doResolvePick(DrawContext dc, Rectangle pickRect, Layer layer) * green, and blue components are each stored as an 8-bit unsigned integer, and packed into bits 0-23 of the * returned integer as follows: bits 16-23 are red, bits 8-15 are green, and bits 0-7 are blue. This format is * consistent with the RGB integers used to create the pick colors. - *

        + *

        * This returns 0 if the point is null, if the point contains the clear color, or if the point is * outside the draw context's drawable area. * diff --git a/src/gov/nasa/worldwind/pick/PickedObject.java b/src/gov/nasa/worldwind/pick/PickedObject.java index 7149476a47..e7467f61a5 100644 --- a/src/gov/nasa/worldwind/pick/PickedObject.java +++ b/src/gov/nasa/worldwind/pick/PickedObject.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.pick; diff --git a/src/gov/nasa/worldwind/pick/PickedObjectFactory.java b/src/gov/nasa/worldwind/pick/PickedObjectFactory.java index 634367ec9b..83560b6540 100644 --- a/src/gov/nasa/worldwind/pick/PickedObjectFactory.java +++ b/src/gov/nasa/worldwind/pick/PickedObjectFactory.java @@ -1,13 +1,35 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.pick; /** * PickedObjectFactory provides an interface for lazily creating PickedObject instances. - *

        + *

        * This interface is used by PickSupport to associate a collection of picked objects with a range of pick colors. * PickSupport uses this factory to delay PickedObject construction until a matching pick color is identified. This * eliminates the overhead of creating and managing a large collection of PickedObject instances when only a few may diff --git a/src/gov/nasa/worldwind/pick/PickedObjectList.java b/src/gov/nasa/worldwind/pick/PickedObjectList.java index 981f349343..bbdf26722a 100644 --- a/src/gov/nasa/worldwind/pick/PickedObjectList.java +++ b/src/gov/nasa/worldwind/pick/PickedObjectList.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.pick; diff --git a/src/gov/nasa/worldwind/poi/BasicPointOfInterest.java b/src/gov/nasa/worldwind/poi/BasicPointOfInterest.java index 40c7204d46..de7005e703 100644 --- a/src/gov/nasa/worldwind/poi/BasicPointOfInterest.java +++ b/src/gov/nasa/worldwind/poi/BasicPointOfInterest.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.poi; diff --git a/src/gov/nasa/worldwind/poi/Gazetteer.java b/src/gov/nasa/worldwind/poi/Gazetteer.java index ecd8746f54..4061004413 100644 --- a/src/gov/nasa/worldwind/poi/Gazetteer.java +++ b/src/gov/nasa/worldwind/poi/Gazetteer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.poi; diff --git a/src/gov/nasa/worldwind/poi/POIUtils.java b/src/gov/nasa/worldwind/poi/POIUtils.java index 00105cd5ca..ae7e03e862 100644 --- a/src/gov/nasa/worldwind/poi/POIUtils.java +++ b/src/gov/nasa/worldwind/poi/POIUtils.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.poi; @@ -28,7 +50,7 @@ public class POIUtils * * @param urlString the URL to use to invoke the service. * @return the service results. - * @throws NoItemException if HTTP_BAD_REQUEST is returned from the service. + * @throws NoItemException if HTTP_BAD_REQUEST is returned from the service. * @throws ServiceException if there is a problem invoking the service or retrieving its results. */ public static String callService(String urlString) throws NoItemException, ServiceException diff --git a/src/gov/nasa/worldwind/poi/PointOfInterest.java b/src/gov/nasa/worldwind/poi/PointOfInterest.java index de65f948c1..cb2c5f209b 100644 --- a/src/gov/nasa/worldwind/poi/PointOfInterest.java +++ b/src/gov/nasa/worldwind/poi/PointOfInterest.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.poi; diff --git a/src/gov/nasa/worldwind/poi/YahooGazetteer.java b/src/gov/nasa/worldwind/poi/YahooGazetteer.java index 76db9797df..aa1b35cd1e 100644 --- a/src/gov/nasa/worldwind/poi/YahooGazetteer.java +++ b/src/gov/nasa/worldwind/poi/YahooGazetteer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.poi; diff --git a/src/gov/nasa/worldwind/render/AbstractAnnotation.java b/src/gov/nasa/worldwind/render/AbstractAnnotation.java index e4c67c960e..25cb16b38f 100644 --- a/src/gov/nasa/worldwind/render/AbstractAnnotation.java +++ b/src/gov/nasa/worldwind/render/AbstractAnnotation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -11,12 +33,12 @@ import gov.nasa.worldwind.pick.PickSupport; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; /** * An {@link Annotation} represent a text label and its rendering attributes. Annotations must be attached either to a - * globe Position ({@link GlobeAnnotation}) or a viewport Point (ScreenAnnotation).

        + * globe Position ({@link GlobeAnnotation}) or a viewport Point (ScreenAnnotation). *

          * GlobeAnnotation ga = new  GlobeAnnotation("Lat-Lon zero", Position.fromDegrees(0, 0, 0)));
          * ScreenAnnotation sa = new ScreenAnnotation("Message...", new Point(10,10));
        @@ -31,42 +53,41 @@
          * ga.getAttributes().setFont(Font.decode("Arial-BOLD-24");
          * ...
          * 
        - *

        Annotations are usually handled by an {@link gov.nasa.worldwind.layers.AnnotationLayer}. Although they also + *

        Annotations are usually handled by an {@link gov.nasa.worldwind.layers.AnnotationLayer}. Although they also * implement the {@link Renderable} interface and thus can be handled by a {@link gov.nasa.worldwind.layers.RenderableLayer} - * too.

        + * too. *

          * AnnotationLayer layer = new AnnotationLayer();
          * layer.addAnnotation(new GlobeAnnotation("Text...", Position.fromDegrees(0, 0, 0)));
          * 
        - *

        Each Annotation starts its life with a fresh attribute set that can be altered to produce the desired effect. + *

        Each Annotation starts its life with a fresh attribute set that can be altered to produce the desired effect. * However, AnnotationAttributes can be set and shared between annotations allowing to control the - * rendering attributes of many annotations from a single AnnotationAttributes object.

        + * rendering attributes of many annotations from a single AnnotationAttributes object. *

          * AnnotationAttributes attr = new AnnotationAttributes();
          * attr.setTextColor(Color.WHITE);
          * attr.setFont(Font.decode("Arial-BOLD-24");
          * ga.setAttributes(attr);
          * 
        - *

        In the above example changing the text color of the attributes set will affect all annotations referring it. + *

        In the above example changing the text color of the attributes set will affect all annotations referring it. * However, changing the text color of one of those annotations will also affect all others since it will in fact change * the common attributes set.

        To use an attributes object only as default values for a series of annotations use: *

        *
          * ga.getAttributes().setDefaults(attr);
          * 
        - *

        which can also be done in the Annotation constructor:

        + *

        which can also be done in the Annotation constructor: *

          * GlobeAnnotation ga = new GlobeAnnotation(text, position, attr);
          * 
        - *

        Finer control over attributes inheritance can be achieved using default or fallback attributes set.

        Most + *

        Finer control over attributes inheritance can be achieved using default or fallback attributes set.

        Most * attributes can be set to a 'use default' value which is minus one for numeric values and null for * attributes referring objects (colors, dimensions, insets..). In such a case the value of an attribute will be that of * the default attribute set. New annotations have all their attributes set to use default values.

        - *

        + *

        * Each AnnotationAttributes object points to a default static attributes set which is the fallback source * for attributes with null or -1 values. This default attributes set can be set to any * attributes object other than the static one. - *

        *

          * AnnotationAttributes geoFeature = new AnnotationAttributes();
          * geoFeature.setFrameShape(AVKey.SHAPE_ELLIPSE);
        @@ -83,12 +104,12 @@
          * layer.addAnnotation(new GlobeAnnotation("Spirit Lake", Position.fromDegrees(46.26, -122.15), waterBody);
          * layer.addAnnotation(new GlobeAnnotation("Mt St-Helens", Position.fromDegrees(46.20, -122.19), mountain);
          * 
        - *

        + *

        * In the above example all geographic features have an ellipse shape, water bodies and mountains use that attributes * set has defaults and have their own text colors. They are in turn used as defaults by the two annotations. Mount * Saint Helens attributes could be changed without affecting other mountains. However, changes on the geoFeatures * attributes would affect all mountains and lakes. - *

        + *

        * Background images are specified by setting the Annotation attribute {@link gov.nasa.worldwind.render.AnnotationAttributes#setImageSource(Object)}. * The source can be either a path to a valid image file, or a {@link java.awt.image.BufferedImage}. By default, * background images are aligned with the annotation as follows: the image's upper left corner is aligned with the @@ -102,19 +123,19 @@ * background image's magnification or minification factor relative to the annotation. For example, a scale of * 0.5 indicates the image should be 1/2 its original size relative to the annotation, while a scale of * 2.0 indicates the image should be 2x its original size. - *

        + *

        * Warning: For compatibility across the myriad of graphics hardware, background images must have * power-of-two dimensions. Non-power-of-two images are handled inconsistently by graphics hardware. Not all hardware * supports them, and many that do lack full support for the features available when using power-of-two images. Proper * conversion from a non-power-of-two image to a power-of-two image depends on the image's intended use. However, the * following two step solution works for most applications:

        1. Create a transparent power-of-two image larger than * the original image. The utility method {@link gov.nasa.worldwind.util.WWMath#powerOfTwoCeiling(int)} is useful for - * computing power-of-two dimensions:

          int newWidth = WWMath.powerOfTwoCeiling(originalWidth);
          int - * newHeight = WWMath.powerOfTwoCeiling(originalHeight);

        2. Copy the original image contents + * computing power-of-two dimensions:

          int newWidth = WWMath.powerOfTwoCeiling(originalWidth);
          int + * newHeight = WWMath.powerOfTwoCeiling(originalHeight);

        3. Copy the original image contents * into the empty power-of-two image. Any pixels not covered by the original image are left completely transparent: - *

          BufferedImage newImage = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_ARGB);
          - * Graphics2D g2d = newImage.createGraphics();
          try
          {
            g2d.drawImage(originalImage, 0, 0, - * null);
          }
          finally
          {
            g2d.dispose();
          }

        When used as an + *

        BufferedImage newImage = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_ARGB);
        + * Graphics2D g2d = newImage.createGraphics();
        try
        {
          g2d.drawImage(originalImage, 0, 0, + * null);
        }
        finally
        {
          g2d.dispose();
        }

        When used as an * Annotation background image, the new power-of-two image appears identical to its original non-power-of-two * counterpart, except that the new image is now compatible with most graphics hardware. * @@ -493,7 +514,7 @@ protected double computeOpacity(DrawContext dc) /** * Get the annotation bounding {@link java.awt.Rectangle} using OGL coordinates - bottom-left corner x and y * relative to the {@link WorldWindow} bottom-left corner, and the annotation callout width and height. - *

        + *

        * The annotation offset from it's reference point is factored in such that the callout leader shape and reference * point are included in the bounding rectangle. * diff --git a/src/gov/nasa/worldwind/render/AbstractAnnotationBalloon.java b/src/gov/nasa/worldwind/render/AbstractAnnotationBalloon.java index feed2e7bb3..1b19bd786f 100644 --- a/src/gov/nasa/worldwind/render/AbstractAnnotationBalloon.java +++ b/src/gov/nasa/worldwind/render/AbstractAnnotationBalloon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -188,7 +210,7 @@ protected void computeOffsets(DrawContext dc) // Apply the computed balloon size and offset to the internal annotation's attributes. Adjust the screen // offset so that an offset of (0, 0) pixels maps to the annotation's lower left corner, and an offset of // (1, 1) fractions maps to the annotation's upper right corner. We do this to present a consistent meaning - // for offset throughout the World Wind SDK. By default, annotation's offset is relative to it's bottom + // for offset throughout the WorldWind SDK. By default, annotation's offset is relative to it's bottom // center. We apply an additional offset of width/2 to compensate for this. annotationAttrs.setSize(screenSize); annotationAttrs.setDrawOffset( diff --git a/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java b/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java index 324c70ce4e..60f0579e47 100644 --- a/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java +++ b/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.pick.PickSupport; import gov.nasa.worldwind.util.*; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; /** * @author dcollins diff --git a/src/gov/nasa/worldwind/render/AbstractBalloon.java b/src/gov/nasa/worldwind/render/AbstractBalloon.java index be5d99a9f5..a0eb6eb18d 100644 --- a/src/gov/nasa/worldwind/render/AbstractBalloon.java +++ b/src/gov/nasa/worldwind/render/AbstractBalloon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; diff --git a/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java b/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java index a9cc0e7313..9c77cd54fc 100644 --- a/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java +++ b/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -14,7 +36,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.util.webview.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.awt.event.*; import java.awt.geom.*; @@ -34,9 +56,9 @@ * java.net.URL}, or a String containing a valid URL description. If a browser balloon's resource * resolver is null or is an unrecognized type, the browser interprets relative URLs as * unresolved references. - *

        + *

        * Browser Controls - *

        + *

        * Browser balloons display three default browser controls that enable users to navigate the browser's history back and * forward, and to close the balloon. When the user selects one of these controls, a SelectEvent is * generated with the PickedObject's AVKey.ACTION value set to one of @@ -44,17 +66,17 @@ * disabled by calling setDrawBrowserControls (they are enabled by default), and may be customized by * adding or removing controls from the browser balloon. See getBrowserControls, * addBrowserControl, and removeBrowserControl. - *

        + *

        * Resize Control - *

        + *

        * Browser balloons provide a default resize control that is activated by dragging the balloon's border. When the user * drags the border, a SelectEvent is generated with the PickedObject's AVKey.ACTION value set * to AVKey.RESIZE. The PickedObject's AVKey.BOUNDS value holds the Balloon's * screen bounds in AWT coordinates (origin at the upper left corner) as a java.awt.Rectangle. The resize * control may be enabled or disabled by calling setDrawResizeControl (it is enabled by default). - *

        + *

        * Balloon Size - *

        + *

        * The browser balloon's screen width and height are specified as a {@link gov.nasa.worldwind.render.Size} * object in its BalloonAttributes. This size may configured in one of the following three modes:

          *
        • Explicit size in pixels.
        • Fraction of the WorldWindow size.
        • Fit to the balloon's @@ -63,23 +85,23 @@ * Size object in its BalloonAttributes. If the maximum size is null, the * balloon's width and height are unlimited. The space provided for the balloon's HTML content equal to the balloon's * screen width and height minus the balloon's insets, also specified in its BalloonAttributes - *

          + *

          * The balloon's width or height (or both) may be configured to fit to the balloon's HTML content by configuring its * BalloonAttributes with a Size who's width or height mode is * Size.NATIVE_DIMENSION or Size.MAINTAIN_ASPECT_RATIO. When configured in this mode, the * browser balloon's size always fits the HTML content specified at construction or by calling setText. If * a user action causes the balloon to navigate to another page, the balloon continues to fit to its current HTML * content. - *

          + *

          * The balloon frame's corner radius and leader width specified in its BalloonAttributes are limited by the * balloon's size. The corner radius is first limited by the balloon's width and height, then the leader width is * limited by the balloon's width and height minus space taken by rounded corners. For example, if the corner radius is * 100 and the width and height are 50 and 100, the actual corner radius used is 25 - half of the rectangle's smallest * dimension. Similarly, if the leader is attached to the rectangle's bottom, its width is limited by the rectangle's * width minus any space used by the balloon's rounded corners. - *

          + *

          * Hiding the balloon - *

          + *

          * The balloon can be made visible or invisible by calling {@link #setVisible(boolean) setVisible}. The balloon's {@code * visibilityAction} determines what happens to the native web browser when the balloon is invisible. The balloon can * either release its native web browser, preventing the native browser from consuming system resources while the @@ -93,7 +115,9 @@ * * @author dcollins * @version $Id: AbstractBrowserBalloon.java 2148 2014-07-14 16:27:49Z tgaskins $ + * @deprecated */ +@Deprecated public abstract class AbstractBrowserBalloon extends AbstractBalloon implements HotSpot, Disposable { @@ -352,8 +376,8 @@ public void render(DrawContext dc) /** * Returns a list containing the browser balloon's three default browser controls, configured as follows: - *

          - * + *
          ControlActionOffsetSizeImage Source
          + * * *
          Controls
          ControlActionOffsetSizeImage Source
          CloseAVKey.CLOSE(30, 25) pixels inset from the balloon's upper right * cornerImage source's native size in pixels (16x16)images/browser-close-16x16.gif
          BackAVKey.BACK(15, 25) pixels inset from the balloon's upper left @@ -438,6 +462,7 @@ protected AbstractBrowserBalloon(String text) * Computes and stores the balloon's model-coordinate and screen-coordinate points. * * @param dc the current draw context. + * @param obb The balloon. */ protected abstract void computeBalloonPoints(DrawContext dc, OrderedBrowserBalloon obb); @@ -447,6 +472,7 @@ protected AbstractBrowserBalloon(String text) * Disposes the balloon's internal {@link gov.nasa.worldwind.util.webview.WebView}. This does nothing * if the balloon is already disposed. */ + @Override public void dispose() { this.disposeWebView(); @@ -484,7 +510,7 @@ public void setDrawResizeControl(boolean draw) /** * {@inheritDoc} - *

          + *

          * When this balloon is set to invisible, the {@code visibilityAction} determines what happens to the native web * browser that backs the balloon. By default, the browser resources are released when the balloon is not visible. * @@ -520,7 +546,7 @@ public int getOutlinePickWidth() * Specifies the outline line width (in pixels) to use during picking. The specified width must be zero * or a positive integer. Specifying a pick width of zero effectively disables the picking of the balloon's outline * and its resize control. A larger width than normal typically makes the outline easier to pick. - *

          + *

          * When the the balloon's resize control is enabled, the outline becomes the resize control and is drawn in the * specified width. Therefore this value also controls the balloon's resize control width. If the * resize control is disabled by calling {@link #setDrawResizeControl(boolean)} with a value of @@ -665,10 +691,9 @@ public Object getResourceResolver() /** * Specifies a the object to use when resolving relative resource paths in this browser balloon's HTML content. The * resourceResolver may be one of the following: - *

          *

          • a {@link gov.nasa.worldwind.util.webview.WebResourceResolver}
          • a {@link * java.net.URL}
          • a {@link String} containing a valid URL description
          - *

          + *

          * If the resourceResolver is null or is not one of the recognized types, this browser * balloon interprets relative resource paths as unresolved references. * @@ -742,7 +767,7 @@ public void goForward() /** * {@inheritDoc} - *

          + *

          * Overridden to suppress AVKey.REPAINT property change events sent by the balloon's internal * {@link gov.nasa.worldwind.util.webview.WebView} when isVisible returns * false. @@ -824,7 +849,7 @@ public void render(DrawContext dc) * balloon. This queues an ordered renderable if the balloon intersects the current viewing frustum, and if the * balloon's internal rendering state can be computed. This updates the balloon's rendering state by calling * updateRenderStateIfNeeded, and updates its geometry by calling computeGeometry. - *

          + *

          * BrowserBalloon separates render state updates from geometry updates for two reasons:

          • Geometry may be * updated based on different conditions.
          • Rendering state potentially needs to be updated in * getBounds.
          @@ -891,13 +916,14 @@ protected void makeOrderedRenderable(DrawContext dc) } /** - * Update the balloon's active attributes and points, if that hasn't already been done this frame. This updates the + * Update the balloon's active attributes and points, if that hasn't already been done this frame.This updates the * balloon's rendering state as follows:
          • Computes the balloon's active attributes by calling * determineActiveAttributes and stores the result in activeAttributes.
          • Computes * the balloon's model-coordinate and screen-coordinate points by calling computeBalloonPoints.
          • *
          * * @param dc the current draw context. + * @param obb The balloon to update. */ protected void updateRenderStateIfNeeded(DrawContext dc, OrderedBrowserBalloon obb) { @@ -977,6 +1003,7 @@ protected Point computeOffset(DrawContext dc, BalloonAttributes activeAttrs, int * Indicates whether this balloon's screen-coordinate geometry must be recomputed as a result of a balloon attribute * changing. * + * @param obb The balloon to check. * @return true if this balloon's geometry must be recomputed, otherwise false. */ protected boolean mustRegenerateGeometry(OrderedBrowserBalloon obb) @@ -997,6 +1024,7 @@ protected boolean mustRegenerateGeometry(OrderedBrowserBalloon obb) /** * Updates the balloon's screen-coordinate geometry in frameInfo according to the current screen * bounds, screen offset, and active attributes. + * @param obb The balloon to update. */ protected void computeGeometry(OrderedBrowserBalloon obb) { @@ -1023,6 +1051,7 @@ protected void computeGeometry(OrderedBrowserBalloon obb) /** * Creates the balloon's frame vertex buffer according to the active attributes. * + * @param obb The balloon. * @return a buffer containing the frame's x and y locations. */ protected FloatBuffer createFrameVertices(OrderedBrowserBalloon obb) @@ -1115,6 +1144,7 @@ protected FloatBuffer makeRectangleFrameVertices(OrderedBrowserBalloon obb) * Determines whether the balloon intersects the view frustum. * * @param dc the current draw context. + * @param obb The balloon to check. * * @return true If the balloon intersects the frustum, otherwise false. */ @@ -1306,18 +1336,19 @@ protected void drawFrame(DrawContext dc, OrderedBrowserBalloon obb) /** * Draws this browser balloon's interior geometry in screen-coordinates, with the WebView's texture - * representation applied as an OpenGL decal. OpenGL's texture decal mode uses the texture color where the texture's + * representation applied as an OpenGL decal.OpenGL's texture decal mode uses the texture color where the texture's * alpha is 1, and uses the balloon's background color where it's 0. The texture's internal format must be RGBA to * work correctly, and this assumes that the WebView's texture format is RGBA. - *

          + *

          * If the WebView's texture cannot be created or cannot be applied for any reason, this displays the * balloon's interior geometry in the balloon's background color without applying the WebView's * texture. - *

          + *

          * If the specified draw context is in picking mode, this draws the balloon's interior geometry in the current color * and does not apply the WebView's texture. * * @param dc the current draw context. + * @param obb The balloon to draw. */ protected void drawFrameInterior(DrawContext dc, OrderedBrowserBalloon obb) { @@ -1648,7 +1679,7 @@ protected void drawWebViewLinks(DrawContext dc, OrderedBrowserBalloon obb) if (linkParams.getValue(AVKey.BOUNDS) == null || linkParams.getValue(AVKey.RECTANGLES) == null) continue; - // Translate the bounds from WebView coordinates to World Window screen coordinates. + // Translate the bounds from WebView coordinates to WorldWindow screen coordinates. Rectangle bounds = new Rectangle((Rectangle) linkParams.getValue(AVKey.BOUNDS)); bounds.translate(obb.webViewRect.x, obb.webViewRect.y); @@ -1686,9 +1717,10 @@ protected void drawWebViewLinks(DrawContext dc, OrderedBrowserBalloon obb) } /** - * Draw pickable regions for the resize controls. A pickable region is drawn along the frame outline. + * Draw pickable regions for the resize controls.A pickable region is drawn along the frame outline. * * @param dc Draw context. + * @param obb The balloon. */ protected void drawResizeControl(DrawContext dc, OrderedBrowserBalloon obb) { @@ -1994,7 +2026,7 @@ public void mouseDragged(MouseEvent event) * Forwards the mouse moved event to the balloon's internal {@link gov.nasa.worldwind.util.webview.WebView}. * This does not consume the event, because the {@link gov.nasa.worldwind.event.InputHandler} * implements the policy for consuming or forwarding mouse moved events to other objects. - *

          + *

          * Unlike mouse clicked, mouse pressed, and mouse dragged events, mouse move events cannot be forwarded to the * WebView via SelectEvents in selected, because mouse movement events are not selection events. * @@ -2012,7 +2044,7 @@ public void mouseMoved(MouseEvent event) * Forwards the mouse wheel event to the balloon's internal {@link gov.nasa.worldwind.util.webview.WebView} * and consumes the event. This consumes the event so the {@link gov.nasa.worldwind.View} doesn't * respond to it. - *

          + *

          * Unlike mouse clicked, mouse pressed, and mouse dragged events, mouse wheel events cannot be forwarded to the * WebView via SelectEvents in selected, because mouse wheel events are not selection events. * @@ -2129,7 +2161,7 @@ else if (event.isDragEnd()) /** * Sends the specified KeyEvent to the balloon's internal WebView. - *

          + *

          * This does nothing if the balloon's internal WebView is uninitialized. * * @param event the event to send. @@ -2143,7 +2175,7 @@ protected void handleKeyEvent(KeyEvent event) /** * Sends the specified MouseEvent to the balloon's internal WebView. The event's point is * converted from AWT coordinates to the WebView's local coordinate system. - *

          + *

          * This does nothing if the balloon's internal WebView is uninitialized. * * @param event the event to send. @@ -2162,7 +2194,7 @@ protected void handleMouseEvent(MouseEvent event) if (event instanceof MouseWheelEvent) { this.webView.sendEvent( - new MouseWheelEvent((Component) event.getSource(), event.getID(), event.getWhen(), event.getModifiers(), + new MouseWheelEvent((Component) event.getSource(), event.getID(), event.getWhen(), event.getModifiersEx(), webViewPoint.x, webViewPoint.y, event.getClickCount(), event.isPopupTrigger(), ((MouseWheelEvent) event).getScrollType(), ((MouseWheelEvent) event).getScrollAmount(), ((MouseWheelEvent) event).getWheelRotation())); @@ -2170,7 +2202,7 @@ protected void handleMouseEvent(MouseEvent event) else { this.webView.sendEvent( - new MouseEvent((Component) event.getSource(), event.getID(), event.getWhen(), event.getModifiers(), + new MouseEvent((Component) event.getSource(), event.getID(), event.getWhen(), event.getModifiersEx(), webViewPoint.x, webViewPoint.y, event.getClickCount(), event.isPopupTrigger(), event.getButton())); } } diff --git a/src/gov/nasa/worldwind/render/AbstractGeneralShape.java b/src/gov/nasa/worldwind/render/AbstractGeneralShape.java index c7cf694e8f..0148bd8365 100644 --- a/src/gov/nasa/worldwind/render/AbstractGeneralShape.java +++ b/src/gov/nasa/worldwind/render/AbstractGeneralShape.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -20,18 +42,18 @@ * models imported from COLLADA and other 3D file formats. The model's geometry is defined in its own coordinate system; * properties of this shape place and orient the model geographically. Specific model types subclass this class to * provide their implementation and any additional properties. - *

          + *

          * This class also accepts a resource map to independently link resources named in the model definition (the defining * model file) to actual resources. Each map entry's key is a resource name as expressed in the model definition. Each * map entry's value is the reference to the actual resource. The reference is interpreted by rules specific to the * model format, but typically may be a relative or absolute file reference or a URL to a local or remote resource. If * the map or an entry referred to by the model definition is not defined, resource references are typically considered * relative to the location of the model definition's location. - *

          + *

          * In the case of a COLLADA file referenced from a KML file, relative references are considered relative to the location * of the KML file. If the file is KMZ, relative references are considered references to resources within the KMZ * archive. - *

          + *

          * This class applies {@link ShapeAttributes} to the shape, but the effect of some of those attributes, such as {@link * ShapeAttributes#isDrawOutline()} is dependent on the specific implementation of this AbstractGeneralShape. See * the class description of those shapes to determine how shape attributes are applied. @@ -253,7 +275,7 @@ protected Vec4 computeReferencePoint(Terrain terrain) /** * Computes the minimum distance between this shape and the eye point. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. diff --git a/src/gov/nasa/worldwind/render/AbstractShape.java b/src/gov/nasa/worldwind/render/AbstractShape.java index 8fc50c3daf..a09c7cc5fb 100644 --- a/src/gov/nasa/worldwind/render/AbstractShape.java +++ b/src/gov/nasa/worldwind/render/AbstractShape.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -19,7 +41,7 @@ import gov.nasa.worldwind.terrain.Terrain; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.xml.stream.*; import java.awt.*; import java.io.*; @@ -27,7 +49,7 @@ /** * Provides a base class form several geometric {@link gov.nasa.worldwind.render.Renderable}s. Implements common * attribute handling and rendering flow for outlined shapes. Provides common defaults and common export code. - *

          + *

          * In order to support simultaneous use of this shape with multiple globes (windows), this shape maintains a cache of * data computed relative to each globe. During rendering, the data for the currently active globe, as indicated in the * draw context, is made current. Subsequently called methods rely on the existence of this current data cache entry. @@ -91,7 +113,7 @@ public abstract class AbstractShape extends WWObjectImpl /** * Indicates whether texture should be applied to this shape. Called during rendering to determine whether texture * state should be established during preparation for interior drawing. - *

          + *

          * Note: This method always returns false during the pick pass. * * @param dc the current draw context @@ -131,7 +153,7 @@ public abstract class AbstractShape extends WWObjectImpl * Draws this shape's outline. Called immediately after calling {@link #prepareToDrawOutline(DrawContext, * ShapeAttributes, ShapeAttributes)}, which establishes OpenGL state for lighting, blending, pick color and line * attributes. Subclasses should execute the drawing commands specific to the type of shape. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -142,7 +164,7 @@ public abstract class AbstractShape extends WWObjectImpl * Draws this shape's interior. Called immediately after calling {@link #prepareToDrawInterior(DrawContext, * ShapeAttributes, ShapeAttributes)}, which establishes OpenGL state for lighting, blending, pick color and * interior attributes. Subclasses should execute the drawing commands specific to the type of shape. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -151,7 +173,7 @@ public abstract class AbstractShape extends WWObjectImpl /** * Fill this shape's vertex buffer objects. If the vertex buffer object resource IDs don't yet exist, create them. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -463,9 +485,9 @@ public int getAltitudeMode() /** * Specifies this shape's altitude mode, one of {@link WorldWind#ABSOLUTE}, {@link WorldWind#RELATIVE_TO_GROUND} or * {@link WorldWind#CLAMP_TO_GROUND}. - *

          + *

          * Note: If the altitude mode is unrecognized, {@link WorldWind#ABSOLUTE} is used. - *

          + *

          * Note: Subclasses may recognize additional altitude modes or may not recognize the ones described above. * * @param altitudeMode the altitude mode. The default value is {@link WorldWind#ABSOLUTE}. @@ -489,7 +511,7 @@ public double getDistanceFromEye() * * @return true if batch rendering is enabled, otherwise false. * - * @see #setEnableBatchRendering(boolean). + * @see #setEnableBatchRendering(boolean) */ public boolean isEnableBatchRendering() { @@ -513,7 +535,7 @@ public void setEnableBatchRendering(boolean enableBatchRendering) * * @return true if batch rendering is enabled, otherwise false. * - * @see #setEnableBatchPicking(boolean). + * @see #setEnableBatchPicking(boolean) */ public boolean isEnableBatchPicking() { @@ -525,7 +547,7 @@ public boolean isEnableBatchPicking() * together if they are contained in the same layer. This increases performance but allows only the top-most of the * polygons to be reported in a {@link gov.nasa.worldwind.event.SelectEvent} even if several of the polygons are at * the pick position. - *

          + *

          * Batch rendering ({@link #setEnableBatchRendering(boolean)}) must be enabled in order for batch picking to occur. * * @param enableBatchPicking true to enable batch rendering, otherwise false. @@ -549,7 +571,7 @@ public int getOutlinePickWidth() /** * Specifies the outline line width to use during picking. A larger width than normal typically makes the outline * easier to pick. - *

          + *

          * Note that the size of the pick aperture also affects the precision necessary to pick. * * @param outlinePickWidth the outline pick width. The default is 10. @@ -733,7 +755,7 @@ public ShapeAttributes getActiveAttributes() /** * Indicates whether this shape's renderable geometry must be recomputed, either as a result of an attribute or * property change or the expiration of the geometry regeneration interval. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -978,7 +1000,7 @@ public void render(DrawContext dc) /** * Determines whether to add this shape to the draw context's ordered renderable list. Creates this shapes * renderable geometry. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1091,7 +1113,7 @@ protected void checkViewDistanceExpiration(DrawContext dc) /** * Determines whether this shape intersects the view frustum. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1111,7 +1133,7 @@ protected boolean intersectsFrustum(DrawContext dc) /** * Draws this shape as an ordered renderable. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1135,7 +1157,7 @@ protected void drawOrderedRenderable(DrawContext dc) /** * Draws this ordered renderable and all subsequent Path ordered renderables in the ordered renderable list. If the * current pick mode is true, only shapes within the same layer are drawn as a batch. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1183,7 +1205,7 @@ else if (this.isEnableBatchPicking()) * {@link PickSupport}. The PickSupport may not be the one associated with this instance. During batch * picking the PickSupport of the instance initiating the batch picking is used so that all shapes * rendered in batch are added to the same pick list. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1218,7 +1240,7 @@ protected void doDrawOrderedRenderable(DrawContext dc, PickSupport pickCandidate * * @deprecated Use the more general {@link #createPickedObject(int)} instead. */ - @SuppressWarnings({"UnusedParameters"}) + @Deprecated protected PickedObject createPickedObject(DrawContext dc, Color pickColor) { return this.createPickedObject(pickColor.getRGB()); @@ -1239,7 +1261,7 @@ protected PickedObject createPickedObject(int colorCode) /** * Establish the OpenGL state needed to draw this shape. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1292,7 +1314,7 @@ protected OGLStackHandler beginDrawing(DrawContext dc, int attrMask) /** * Pop the state set in {@link #beginDrawing(DrawContext, int)}. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1317,7 +1339,7 @@ protected void endDrawing(DrawContext dc) /** * Draws this shape's outline. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1393,7 +1415,7 @@ protected void prepareToDrawOutline(DrawContext dc, ShapeAttributes activeAttrs, /** * Draws this shape's interior. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1540,7 +1562,7 @@ protected Extent computeExtentFromPositions(Globe globe, double verticalExaggera /** * Get or create OpenGL resource IDs for the current data cache entry. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. @@ -1555,7 +1577,7 @@ protected int[] getVboIds(DrawContext dc) /** * Removes from the GPU resource cache the entry for the current data cache entry's VBOs. - *

          + *

          * A {@link gov.nasa.worldwind.render.AbstractShape.AbstractShapeData} must be current when this method is called. * * @param dc the current draw context. diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java b/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java index 91f76350b1..708afd1274 100644 --- a/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java +++ b/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -15,7 +37,7 @@ import gov.nasa.worldwind.pick.*; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.util.*; import java.util.List; @@ -27,7 +49,7 @@ * building the composite representation the SceneController invokes {@link #render(DrawContext)} in ordered rendering * mode. To avoid overloading the purpose of the render method, AbstractSurfaceObject does not add itself to the * DrawContext's ordered surface renderable queue during rendering. - *

          + *

          * Subclasses that do not wish to participate in this composite representation can override this behavior as follows: *

          1. Override {@link #makeOrderedPreRenderable(DrawContext)}; do not add this object to the draw context's * ordered renderable queue. Perform any preRender processing necessary for the subclass to pick and render itself.
          2. @@ -299,6 +321,13 @@ protected void clearCaches() this.extentCache.clear(); } + /* Updates this SurfaceObject's modified time and clears its internal caches. */ + protected void onShapeChanged() + { + this.updateModifiedTime(); + this.clearCaches(); + } + //**************************************************************// //******************** Extent ********************************// //**************************************************************// @@ -436,7 +465,7 @@ protected boolean intersectsVisibleSector(DrawContext dc) * DrawContext's ordered surface renderable list. Additionally, this prepares the SurfaceObject's pickable * representation if the SurfaceObject's containing layer is enabled for picking and the SurfaceObject intersects * one of the DrawContext's picking frustums. - *

            + *

            * During ordered preRendering, the {@link gov.nasa.worldwind.SceneController} builds a composite representation of * this SurfaceObject and any other SurfaceObject on the DrawContext's ordered surface renderable list. The * SceneController causes each SurfaceObject's to draw itself into the composite representation by calling its @@ -472,7 +501,7 @@ protected void makeOrderedPreRenderable(DrawContext dc) * DrawContext's ordered surface renderable list. We ignore this call during rendering mode to suppress calls to * {@link #render(DrawContext)} during ordered rendering mode. The SceneController already invokes render during * ordered picking mode to build a composite representation of the SurfaceObjects. - *

            + *

            * During ordered picking, the {@link gov.nasa.worldwind.SceneController} invokes the SurfaceObject's {@link * #pick(DrawContext, java.awt.Point)} method. * @@ -707,7 +736,7 @@ protected SurfaceObjectTileBuilder createPickTileBuilder() /** * Causes this SurfaceObject to render its bounding sectors to the specified region in geographic coordinates. The * specified viewport denotes the geographic region and its corresponding screen viewport. - *

            + *

            * The bounding sectors are rendered as a 1 pixel wide green outline. * * @param dc the current DrawContext. @@ -770,7 +799,7 @@ protected void drawBoundingSectors(DrawContext dc, SurfaceTileDrawContext sdc) * Represents a surface object's current state. StateKey uniquely identifies a surface object's current state as * follows:

            • The StateKey class distinguishes the key from other object types.
            • The object's unique * ID distinguishes one surface object instances from another.
            • The object's modified time distinguishes an - * object's internal state from any of its previous states.
            • Using the unique ID to distinguish between objects + * object's internal state from any of its previous states.
            Using the unique ID to distinguish between objects * ensures that the StateKey does not store dangling references to the surface object itself. Should the StateKey * live longer than the surface object that created it, the StateKey does not prevent the object from being garbage * collected. diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java b/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java index 2c4a9b850c..659c1ca03b 100644 --- a/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java +++ b/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.view.orbit.OrbitView; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import java.awt.*; import java.util.*; import java.util.List; diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java b/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java index 0cc88cefd6..ed81fe11b6 100644 --- a/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java +++ b/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -17,8 +39,8 @@ import gov.nasa.worldwind.util.combine.*; import gov.nasa.worldwind.util.measure.AreaMeasurer; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import javax.xml.stream.XMLStreamException; import java.awt.*; import java.io.IOException; @@ -30,11 +52,11 @@ * Common superclass for surface conforming shapes such as {@link gov.nasa.worldwind.render.SurfacePolygon}, {@link * gov.nasa.worldwind.render.SurfacePolyline}, {@link gov.nasa.worldwind.render.SurfaceEllipse}, {@link * gov.nasa.worldwind.render.SurfaceQuad}, and {@link gov.nasa.worldwind.render.SurfaceSector}. - *

            + *

            * SurfaceShapes have separate attributes for normal display and highlighted display. If no attributes are specified, * default attributes are used. See {@link #DEFAULT_INTERIOR_MATERIAL}, {@link #DEFAULT_OUTLINE_MATERIAL}, and {@link * #DEFAULT_HIGHLIGHT_MATERIAL}. - *

            + *

            * AbstractSurfaceShape extends from {@link gov.nasa.worldwind.render.AbstractSurfaceObject}, and therefore inherits * AbstractSurfaceObject's batch rendering capabilities. * @@ -228,7 +250,7 @@ public void setMinAndMaxEdgeIntervals(int minEdgeIntervals, int maxEdgeIntervals /** * {@inheritDoc} - *

            + *

            * The returned state key is constructed the SurfaceShape's unique ID, last modified time, and its active * attributes. The returned state key has no dependency on the {@link gov.nasa.worldwind.globes.Globe}. Subclasses * that depend on the Globe should return a state key that include the globe's state key. @@ -603,15 +625,9 @@ public void combine(CombineContext cc) protected abstract void doMoveTo(Position oldReferencePosition, Position newReferencePosition); protected abstract void doMoveTo(Globe globe, Position oldReferencePosition, Position newReferencePosition); - protected void onShapeChanged() - { - this.updateModifiedTime(); - this.clearCaches(); - } - /** * {@inheritDoc} - *

            + *

            * Overridden to clear this SurfaceShape's internal sector and geometry caches. */ @Override @@ -1666,7 +1682,7 @@ else if (s.equals(AVKey.RHUMB_LINE)) * Represents a surface shapes's current state. SurfaceShapeStateKey extends {@link * gov.nasa.worldwind.render.AbstractSurfaceObject.SurfaceObjectStateKey} by adding the shape's current {@link * gov.nasa.worldwind.render.ShapeAttributes} and the globe's state key. - *

            + *

            * SurfaceShapeStateKey uniquely identifies a surface shapes's current state exactly as SurfaceObjectStateKey does, * but also distinguishes the shape's active ShapeAttributes from any previous attributes, and distinguishes between * different globes via the globe state key. @@ -1793,7 +1809,6 @@ public String isExportFormatSupported(String format) /** * Export the Polygon. The {@code output} object will receive the exported data. The type of this object depends on * the export format. The formats and object types supported by this class are: - *

            *

                  * Format                                         Supported output object types
                  * ================================================================================
            diff --git a/src/gov/nasa/worldwind/render/Annotation.java b/src/gov/nasa/worldwind/render/Annotation.java
            index 9cef9f9169..01c870022d 100644
            --- a/src/gov/nasa/worldwind/render/Annotation.java
            +++ b/src/gov/nasa/worldwind/render/Annotation.java
            @@ -1,7 +1,29 @@
             /*
            - * Copyright (C) 2012 United States Government as represented by the Administrator of the
            - * National Aeronautics and Space Administration.
            - * All Rights Reserved.
            + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
            + * Administrator of the National Aeronautics and Space Administration.
            + * All rights reserved.
            + * 
            + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
            + * Version 2.0 (the "License"); you may not use this file except in compliance
            + * with the License. You may obtain a copy of the License at
            + * http://www.apache.org/licenses/LICENSE-2.0
            + * 
            + * Unless required by applicable law or agreed to in writing, software distributed
            + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
            + * CONDITIONS OF ANY KIND, either express or implied. See the License for the
            + * specific language governing permissions and limitations under the License.
            + * 
            + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
            + * software:
            + * 
            + *     Jackson Parser – Licensed under Apache 2.0
            + *     GDAL – Licensed under MIT
            + *     JOGL – Licensed under  Berkeley Software Distribution (BSD)
            + *     Gluegen – Licensed under Berkeley Software Distribution (BSD)
            + * 
            + * A complete listing of 3rd Party software notices and licenses included in
            + * NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
            + * notices and licenses PDF found in code directory.
              */
             package gov.nasa.worldwind.render;
             
            @@ -10,7 +32,7 @@
             import gov.nasa.worldwind.geom.Position;
             import gov.nasa.worldwind.pick.*;
             
            -import javax.media.opengl.GL;
            +import com.jogamp.opengl.GL;
             
             /**
              * Represent a text label and its rendering attributes.
            @@ -111,7 +133,7 @@ public interface Annotation extends Renderable, Disposable, Restorable
                 /**
                  * Get the annotation bounding {@link java.awt.Rectangle} using OGL coordinates - bottom-left corner x and y
                  * relative to the {@link WorldWindow} bottom-left corner, and the annotation callout width and height.
            -     * 

            + *

            * The annotation offset from it's reference point is factored in such that the callout leader shape and reference * point are included in the bounding rectangle. * diff --git a/src/gov/nasa/worldwind/render/AnnotationAttributes.java b/src/gov/nasa/worldwind/render/AnnotationAttributes.java index 0815663351..4040ee0575 100644 --- a/src/gov/nasa/worldwind/render/AnnotationAttributes.java +++ b/src/gov/nasa/worldwind/render/AnnotationAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -844,7 +866,7 @@ public boolean isUnresolved() } /** - * Specifies whether one or more fields of this remain unresolved because they must be retrieved from an + * Specifies whether one or more fields of this remain unresolved because they must be retrieved from an * external source. * * @param unresolved true if there are unresolved fields, false if no fields remain unresolved. diff --git a/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java b/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java index 126d0a3949..ba0346cbfa 100644 --- a/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java +++ b/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.geom.Position; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** * @author dcollins diff --git a/src/gov/nasa/worldwind/render/AnnotationLayoutManager.java b/src/gov/nasa/worldwind/render/AnnotationLayoutManager.java index e6513e18d5..8f1bdc8b41 100644 --- a/src/gov/nasa/worldwind/render/AnnotationLayoutManager.java +++ b/src/gov/nasa/worldwind/render/AnnotationLayoutManager.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; diff --git a/src/gov/nasa/worldwind/render/AnnotationNullLayout.java b/src/gov/nasa/worldwind/render/AnnotationNullLayout.java index 68ff232cc0..290831591d 100644 --- a/src/gov/nasa/worldwind/render/AnnotationNullLayout.java +++ b/src/gov/nasa/worldwind/render/AnnotationNullLayout.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.geom.Position; import gov.nasa.worldwind.util.*; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; /** * @author dcollins diff --git a/src/gov/nasa/worldwind/render/AnnotationRenderer.java b/src/gov/nasa/worldwind/render/AnnotationRenderer.java index 08dc94f838..53c3df0b41 100644 --- a/src/gov/nasa/worldwind/render/AnnotationRenderer.java +++ b/src/gov/nasa/worldwind/render/AnnotationRenderer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; diff --git a/src/gov/nasa/worldwind/render/Attributable.java b/src/gov/nasa/worldwind/render/Attributable.java index 3b69927122..f9d145f46a 100644 --- a/src/gov/nasa/worldwind/render/Attributable.java +++ b/src/gov/nasa/worldwind/render/Attributable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; diff --git a/src/gov/nasa/worldwind/render/Balloon.java b/src/gov/nasa/worldwind/render/Balloon.java index 0acf61c990..1bd8cb99ab 100644 --- a/src/gov/nasa/worldwind/render/Balloon.java +++ b/src/gov/nasa/worldwind/render/Balloon.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -140,7 +162,7 @@ public interface Balloon extends Renderable, Highlightable, AVList /** * Get the balloon bounding {@link java.awt.Rectangle} using OGL coordinates - bottom-left corner x and y relative * to the {@link gov.nasa.worldwind.WorldWindow} bottom-left corner, and the balloon callout width and height. - *

            + *

            * The balloon offset from it's reference point is factored in such that the callout leader shape and reference * point are included in the bounding rectangle. * diff --git a/src/gov/nasa/worldwind/render/BalloonAttributes.java b/src/gov/nasa/worldwind/render/BalloonAttributes.java index aa2ed71cff..c94d11f751 100644 --- a/src/gov/nasa/worldwind/render/BalloonAttributes.java +++ b/src/gov/nasa/worldwind/render/BalloonAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -9,7 +31,7 @@ import java.awt.*; /** - * Holds attributes for World Wind {@link gov.nasa.worldwind.render.Balloon} shapes. Changes made to the attributes are + * Holds attributes for WorldWind {@link gov.nasa.worldwind.render.Balloon} shapes. Changes made to the attributes are * applied to the balloon when the WorldWindow renders the next frame. Instances of * BalloonAttributes may be shared by many balloons, thereby reducing the memory normally required to store * attributes for each balloon. @@ -35,7 +57,7 @@ public interface BalloonAttributes extends ShapeAttributes * AVKey.SHAPE_RECTANGLE, then size specifies the rectangle's width and height. If the * balloon's shape is AVKey.SHAPE_ELLIPSE, then size specifies the ellipse's x- and * y-radii. - *

            + *

            * The balloon's content area is the rectangle obtained by taking the balloon's size and shrinking it * by the balloon's insets. * @@ -87,11 +109,11 @@ public interface BalloonAttributes extends ShapeAttributes * of (0, 0) pixels causes the balloon's lower left corner to be placed at the screen reference point. An * offset of (1, 1) in fraction units causes the balloon's upper right corner to be placed at the * screen reference point. - *

            + *

            * If the balloon is attached to the globe, the screen reference point is the projection of its geographic position * into the viewport. If the balloon is attached to the screen, the screen reference point is the balloon's screen * point. - *

            + *

            * If the balloon has a leader shape, the leader extends from one side of the balloon's frame and points to the * screen reference point. * @@ -116,10 +138,10 @@ public interface BalloonAttributes extends ShapeAttributes * Specifies the amount of space (in pixels) between the balloon's content and the edges of the balloon's frame. The * balloon's content area decreases to account for the specified insets. If the balloon's size and * insets cause the content width or height to become less than 1, then the balloon's content is not displayed. - *

            + *

            * If the balloon's shape is AVKey.SHAPE_RECTANGLE, insets specifies the padding between * the balloon's content area and the rectangle's top, left, bottom, and right. - *

            + *

            * If the balloon's shape is AVKey.SHAPE_ELLIPSE, insets specifies the padding between the * balloon's content area and the ellipse's top, left, bottom, and right apexes. * @@ -144,16 +166,16 @@ public interface BalloonAttributes extends ShapeAttributes * Specifies the shape of the balloon's frame. The shape may be one of the following:

            • {@link * gov.nasa.worldwind.avlist.AVKey#SHAPE_NONE}
            • {@link gov.nasa.worldwind.avlist.AVKey#SHAPE_RECTANGLE}
            • *
            • {@link gov.nasa.worldwind.avlist.AVKey#SHAPE_ELLIPSE}
            - *

            + *

            * If the shape is AVKey.SHAPE_NONE, the balloon's content is displayed in a rectangle in * the viewport without any decoration. The rectangle's dimension in the viewport are specified by calling {@link * #setSize(Size)}. - *

            + *

            * If the shape is AVKey.SHAPE_RECTANGLE, the balloon is displayed as a rectangle in the * viewport with optionally rounded corners. The rectangle's dimension in the viewport are specified by calling * {@link #setSize(Size)}. The rectangle's corner radius in pixels is specified by calling {@link * #setCornerRadius(int)}. - *

            + *

            * If the shape is AVKey.SHAPE_ELLIPSE, the balloon is displayed as an ellipse in the * viewport. The ellipse's x- and y-radii are specified by calling {@link #setSize(Size)}. The balloon's corner * radius attribute is ignored. @@ -180,9 +202,9 @@ public interface BalloonAttributes extends ShapeAttributes * Specifies the shape of the balloon's leader. The shape may be one of the following:

            • {@link * gov.nasa.worldwind.avlist.AVKey#SHAPE_NONE}
            • {@link gov.nasa.worldwind.avlist.AVKey#SHAPE_TRIANGLE}
            • *
            - *

            + *

            * If the shape is AVKey.SHAPE_NONE, the leader is disabled and does not display. - *

            + *

            * If the shape is AVKey.SHAPE_TRIANGLE, the leader extends from one side of the balloon's * frame and points to the balloon's screen reference point. The width of the leader (in pixels) where it intersects * the balloon's frame is specified by calling {@link #setLeaderWidth(int)}. @@ -207,9 +229,9 @@ public interface BalloonAttributes extends ShapeAttributes /** * Specifies the width of the balloon's leader, in pixels. The specified width must be zero or a * positive integer. Specifying a width of zero disables the balloon's leader. - *

            + *

            * This does nothing if the balloon's leader shape is AVKey.SHAPE_NONE. - *

            + *

            * If the balloon's leader shape is AVKey.SHAPE_TRIANGLE, this specifies the size of the leader where * it intersects the balloon's frame. * @@ -344,10 +366,10 @@ public interface BalloonAttributes extends ShapeAttributes * following:

            • {@link gov.nasa.worldwind.avlist.AVKey#REPEAT_NONE}
            • {@link * gov.nasa.worldwind.avlist.AVKey#REPEAT_X}
            • {@link gov.nasa.worldwind.avlist.AVKey#REPEAT_Y}
            • *
            • {@link gov.nasa.worldwind.avlist.AVKey#REPEAT_XY}
            - *

            + *

            * If repeat is AVKey.REPEAT_NONE, the balloon's texture is displayed according to its * offset and scale without any repeating pattern. - *

            + *

            * If repeat is AVKey.REPEAT_X, AVKey.REPEAT_Y, or * AVKey.REPEAT_XY, the balloon's texture is repeated along the X axis, along the Y axis, or along both * the X and Y axes, respectively. The texture is repeated after its offset and scale are applied. diff --git a/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java b/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java index 25e9e8cc27..d93fbf8ba2 100644 --- a/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java +++ b/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -13,7 +35,7 @@ import gov.nasa.worldwind.terrain.SectorGeometryList; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.util.*; import java.util.logging.Level; diff --git a/src/gov/nasa/worldwind/render/BasicBalloonAttributes.java b/src/gov/nasa/worldwind/render/BasicBalloonAttributes.java index 3486309f4e..e240a6fde9 100644 --- a/src/gov/nasa/worldwind/render/BasicBalloonAttributes.java +++ b/src/gov/nasa/worldwind/render/BasicBalloonAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -14,7 +36,7 @@ /** * Basic implementation of the {@link gov.nasa.worldwind.render.BalloonAttributes} interface. Extends - * BasicShapeAttributes to include attributes for World Wind {@link gov.nasa.worldwind.render.Balloon} + * BasicShapeAttributes to include attributes for WorldWind {@link gov.nasa.worldwind.render.Balloon} * shapes. * * @author pabercrombie @@ -52,8 +74,8 @@ public class BasicBalloonAttributes extends BasicShapeAttributes implements Ball /** * Creates a new BasicBalloonAttributes with the default attributes. The default attributes are as * follows: - *

            - * + *
            AttributeDefault Value
            unresolvedtrue
            + * * * * @@ -62,12 +84,12 @@ public class BasicBalloonAttributes extends BasicShapeAttributes implements Ball * * * - * * * - * + * *
            Attributes
            AttributeDefault Value
            unresolvedtrue
            drawInteriortrue
            drawOutlinetrue
            enableAntialiasingtrue
            enableLightingfalse
            interiorMaterial{@link gov.nasa.worldwind.render.Material#WHITE}
            outlineWidth1.0
            outlineStippleFactor0
            outlineStipplePattern0xF0F0
            interiorImageSourcenull
            interiorImageScale1.0
            size350x350 pixels (width x height)
            maximumSizenull
            offset40,60 pixels (x, + *
            maximumSizenull
            offset40,60 pixels (x, * y)
            insets30,15,15,15 (top, left, bottom, right)
            balloonShape{@link AVKey#SHAPE_RECTANGLE}
            leaderShape{@link * AVKey#SHAPE_TRIANGLE}
            leaderWidth40.0
            cornerRadius20.0
            fontArial Plain 12
            textColor{@link java.awt.Color#BLACK}
            imageOffset0,0 (x, y)
            imageOpacity1
            imageOffset0,0 (x, y)
            imageOpacity1
            imageRepeat{@link gov.nasa.worldwind.avlist.AVKey#REPEAT_XY}
            */ public BasicBalloonAttributes() @@ -114,7 +136,7 @@ public BasicBalloonAttributes(BalloonAttributes attributes) /** * {@inheritDoc} - *

            + *

            * Overrides the superclass' behavior to return a new BasicBalloonAttributes. */ public ShapeAttributes copy() @@ -124,7 +146,7 @@ public ShapeAttributes copy() /** * {@inheritDoc} - *

            + *

            * Extends the superclass' behavior to copy BalloonAttributes if the specified attributes * is an instance of BalloonAttributes. */ diff --git a/src/gov/nasa/worldwind/render/BasicLightingModel.java b/src/gov/nasa/worldwind/render/BasicLightingModel.java index 2539a8c44b..8b1df723d2 100644 --- a/src/gov/nasa/worldwind/render/BasicLightingModel.java +++ b/src/gov/nasa/worldwind/render/BasicLightingModel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.geom.Vec4; import gov.nasa.worldwind.util.*; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; /** * Provides a simple lighting model with one light. This model uses only OpenGL light 0. diff --git a/src/gov/nasa/worldwind/render/BasicShapeAttributes.java b/src/gov/nasa/worldwind/render/BasicShapeAttributes.java index 7e7999e227..3bd55d7c9d 100644 --- a/src/gov/nasa/worldwind/render/BasicShapeAttributes.java +++ b/src/gov/nasa/worldwind/render/BasicShapeAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwind.render; @@ -56,8 +78,7 @@ public class BasicShapeAttributes implements ShapeAttributes /** * Creates a new BasicShapeAttributes with the default attributes. The default attributes are as * follows: - *

            - * + *
            AttributeDefault Value
            unresolvedtrue
            * * * @@ -584,7 +605,7 @@ public void export(String mimeType, Object output) throws IOException, Unsupport /** * Export the placemark attributes to KML as a {@code -

            World Wind Search and Rescue Instructions

            +

            WorldWind Search and Rescue Instructions

            Panels and Controls

            SAR Application Frame diff --git a/src/gov/nasa/worldwindx/applications/sar/SARKey.java b/src/gov/nasa/worldwindx/applications/sar/SARKey.java index 43c2e3b163..f04a04ac9b 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SARKey.java +++ b/src/gov/nasa/worldwindx/applications/sar/SARKey.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/SARPosition.java b/src/gov/nasa/worldwindx/applications/sar/SARPosition.java index 7f0dac370a..02ed3f88de 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SARPosition.java +++ b/src/gov/nasa/worldwindx/applications/sar/SARPosition.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/SARSegmentPlane.java b/src/gov/nasa/worldwindx/applications/sar/SARSegmentPlane.java index 4fed3ddf8f..c588b36bef 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SARSegmentPlane.java +++ b/src/gov/nasa/worldwindx/applications/sar/SARSegmentPlane.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/SARTrack.java b/src/gov/nasa/worldwindx/applications/sar/SARTrack.java index d8c1d8d778..833ee2cfba 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SARTrack.java +++ b/src/gov/nasa/worldwindx/applications/sar/SARTrack.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/SARTrackBuilder.java b/src/gov/nasa/worldwindx/applications/sar/SARTrackBuilder.java index c51e55f118..a1266c3e6e 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SARTrackBuilder.java +++ b/src/gov/nasa/worldwindx/applications/sar/SARTrackBuilder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/SARTrackExtensionTool.java b/src/gov/nasa/worldwindx/applications/sar/SARTrackExtensionTool.java index 96c96eb203..c45bb539b5 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SARTrackExtensionTool.java +++ b/src/gov/nasa/worldwindx/applications/sar/SARTrackExtensionTool.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/SaveTrackDialog.java b/src/gov/nasa/worldwindx/applications/sar/SaveTrackDialog.java index 3f9755c121..6ae41d71d7 100644 --- a/src/gov/nasa/worldwindx/applications/sar/SaveTrackDialog.java +++ b/src/gov/nasa/worldwindx/applications/sar/SaveTrackDialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/ScalebarHint.java b/src/gov/nasa/worldwindx/applications/sar/ScalebarHint.java index c18f3270d8..7f2a74c19b 100644 --- a/src/gov/nasa/worldwindx/applications/sar/ScalebarHint.java +++ b/src/gov/nasa/worldwindx/applications/sar/ScalebarHint.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/TerrainProfilePanel.java b/src/gov/nasa/worldwindx/applications/sar/TerrainProfilePanel.java index 62a53e2397..da2225733c 100644 --- a/src/gov/nasa/worldwindx/applications/sar/TerrainProfilePanel.java +++ b/src/gov/nasa/worldwindx/applications/sar/TerrainProfilePanel.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.applications.sar; import gov.nasa.worldwind.*; @@ -16,7 +37,6 @@ import gov.nasa.worldwind.layers.Layer; import gov.nasa.worldwind.layers.ScalebarLayer; import gov.nasa.worldwind.layers.TerrainProfileLayer; -import gov.nasa.worldwind.render.Polyline; import javax.swing.*; import javax.swing.border.*; @@ -31,8 +51,8 @@ * @version $Id: TerrainProfilePanel.java 1171 2013-02-11 21:45:02Z dcollins $ */ @SuppressWarnings({"FieldCanBeLocal", "unchecked"}) -public class TerrainProfilePanel extends JPanel implements Restorable -{ +public class TerrainProfilePanel extends JPanel implements Restorable { + public static final String TERRAIN_PROFILE_OPEN = "TerrainProfilePanel.Open"; public static final String TERRAIN_PROFILE_CHANGE = "TerrainProfilePanel.Change"; @@ -40,51 +60,45 @@ public class TerrainProfilePanel extends JPanel implements Restorable private static final String GRAPH_SIZE_SMALL_TEXT = "Small Graph"; private static final String GRAPH_SIZE_MEDIUM_TEXT = "Medium Graph"; private static final String GRAPH_SIZE_LARGE_TEXT = "Large Graph"; - private static final String FOLLOW_VIEW_TEXT = "Profile At Screen Center"; + private static final String FOLLOW_VIEW_TEXT = "Profile At Screen Center"; private static final String FOLLOW_CURSOR_TEXT = "Profile Under Cursor"; //private static final String FOLLOW_EYE_TEXT = "Profile Under Eye"; private static final String FOLLOW_OBJECT_TEXT = "Profile Under Aircraft"; - private static final String FOLLOW_NONE_TEXT = "No Profile"; + private static final String FOLLOW_NONE_TEXT = "No Profile"; - public TerrainProfilePanel() - { + public TerrainProfilePanel() { initComponents(); this.controller = new TerrainProfileController(); } - public WorldWindow getWwd() - { + public WorldWindow getWwd() { return this.controller.getWwd(); } - public void setWwd(WorldWindow wwd) - { + public void setWwd(WorldWindow wwd) { this.controller.setWwd(wwd); this.matchProfileToPanel(); } - private void matchProfileToPanel() - { + private void matchProfileToPanel() { this.setFollow(); this.controller.setProfileSize((String) this.sizeComboBox.getSelectedItem()); this.controller.setKeepProportions(this.proportionalCheckBox.isSelected()); this.controller.setShowEyePosition(this.showEyeCheckBox.isSelected()); this.controller.setZeroBased(this.zeroBaseCheckBox.isSelected()); this.controller.setProfileWidthFactor( - Double.parseDouble(((String)this.profileWidthSpinner.getValue()).replace("x", ""))); + Double.parseDouble(((String) this.profileWidthSpinner.getValue()).replace("x", ""))); this.controller.setProfileLengthFactor( - Double.parseDouble(((String)this.profileLengthSpinner.getValue()).replace("x", ""))); + Double.parseDouble(((String) this.profileLengthSpinner.getValue()).replace("x", ""))); } @SuppressWarnings({"UnusedDeclaration"}) - private void sizeComboBoxActionPerformed(ActionEvent e) - { + private void sizeComboBoxActionPerformed(ActionEvent e) { this.controller.setProfileSize((String) this.sizeComboBox.getSelectedItem()); } @SuppressWarnings({"UnusedDeclaration"}) - private void followComboBoxActionPerformed(ActionEvent e) - { + private void followComboBoxActionPerformed(ActionEvent e) { this.setFollow(); } @@ -92,37 +106,36 @@ private void followComboBoxActionPerformed(ActionEvent e) //{ // this.followComboBox.getModel().setSelectedItem(FOLLOW_EYE_TEXT); //}/ - - public void setFollowObject() - { + public void setFollowObject() { this.followComboBox.getModel().setSelectedItem(FOLLOW_OBJECT_TEXT); } @SuppressWarnings({"StringEquality"}) - private void setFollow() - { + private void setFollow() { this.controller.setFollow((String) this.followComboBox.getSelectedItem()); String follow = this.controller.getFollow(); - if (follow == TerrainProfileLayer.FOLLOW_VIEW) - { - if (this.showEyeCheckBox.isEnabled()) + if (follow == TerrainProfileLayer.FOLLOW_VIEW) { + if (this.showEyeCheckBox.isEnabled()) { this.showEyeCheckBox.setEnabled(false); - if (!this.profileWidthSpinner.isEnabled()) + } + if (!this.profileWidthSpinner.isEnabled()) { this.profileWidthSpinner.setEnabled(true); - if (this.profileLengthSpinner.isEnabled()) + } + if (this.profileLengthSpinner.isEnabled()) { this.profileLengthSpinner.setEnabled(false); - } - else if (follow == TerrainProfileLayer.FOLLOW_CURSOR) - { - if (this.showEyeCheckBox.isEnabled()) + } + } else if (follow == TerrainProfileLayer.FOLLOW_CURSOR) { + if (this.showEyeCheckBox.isEnabled()) { this.showEyeCheckBox.setEnabled(false); - if (!this.profileWidthSpinner.isEnabled()) + } + if (!this.profileWidthSpinner.isEnabled()) { this.profileWidthSpinner.setEnabled(true); - if (this.profileLengthSpinner.isEnabled()) + } + if (this.profileLengthSpinner.isEnabled()) { this.profileLengthSpinner.setEnabled(false); - } - //else if (follow == TerrainProfileLayer.FOLLOW_EYE) + } + } //else if (follow == TerrainProfileLayer.FOLLOW_EYE) //{ // if (!this.showEyeCheckBox.isEnabled()) // this.showEyeCheckBox.setEnabled(true); @@ -131,87 +144,82 @@ else if (follow == TerrainProfileLayer.FOLLOW_CURSOR) // if (!this.profileLengthSlider.isEnabled()) // this.profileLengthSlider.setEnabled(true); //} - else if (follow == TerrainProfileLayer.FOLLOW_OBJECT) - { - if (!this.showEyeCheckBox.isEnabled()) + else if (follow == TerrainProfileLayer.FOLLOW_OBJECT) { + if (!this.showEyeCheckBox.isEnabled()) { this.showEyeCheckBox.setEnabled(true); - if (!this.profileWidthSpinner.isEnabled()) + } + if (!this.profileWidthSpinner.isEnabled()) { this.profileWidthSpinner.setEnabled(true); - if (!this.profileLengthSpinner.isEnabled()) + } + if (!this.profileLengthSpinner.isEnabled()) { this.profileLengthSpinner.setEnabled(true); - } - else if (follow == TerrainProfileLayer.FOLLOW_NONE) - { - if (this.showEyeCheckBox.isEnabled()) + } + } else if (follow == TerrainProfileLayer.FOLLOW_NONE) { + if (this.showEyeCheckBox.isEnabled()) { this.showEyeCheckBox.setEnabled(false); - if (this.profileWidthSpinner.isEnabled()) + } + if (this.profileWidthSpinner.isEnabled()) { this.profileWidthSpinner.setEnabled(false); - if (this.profileLengthSpinner.isEnabled()) + } + if (this.profileLengthSpinner.isEnabled()) { this.profileLengthSpinner.setEnabled(false); + } } } - private void proportionalCheckBoxItemStateChanged(ItemEvent e) - { + private void proportionalCheckBoxItemStateChanged(ItemEvent e) { this.controller.setKeepProportions(((JCheckBox) e.getSource()).isSelected()); } - private void showEyeCheckBoxItemStateChanged(ItemEvent e) - { + private void showEyeCheckBoxItemStateChanged(ItemEvent e) { this.controller.setShowEyePosition(((JCheckBox) e.getSource()).isSelected()); } - private void zeroBaseCheckBoxItemStateChanged(ItemEvent e) - { + private void zeroBaseCheckBoxItemStateChanged(ItemEvent e) { this.controller.setZeroBased(((JCheckBox) e.getSource()).isSelected()); } - private void profileWidthSpinnerStateChanged(ChangeEvent e) - { - String value = (String)((JSpinner) e.getSource()).getValue(); + private void profileWidthSpinnerStateChanged(ChangeEvent e) { + String value = (String) ((JSpinner) e.getSource()).getValue(); value = value.replace("x", ""); this.controller.setProfileWidthFactor(Double.parseDouble(value)); - if (this.profilesSameSize.isSelected()) + if (this.profilesSameSize.isSelected()) { this.profileLengthSpinner.setValue(this.profileWidthSpinner.getValue()); + } } - private void profileLengthSpinnerStateChanged(ChangeEvent e) - { - String value = (String)((JSpinner) e.getSource()).getValue(); + private void profileLengthSpinnerStateChanged(ChangeEvent e) { + String value = (String) ((JSpinner) e.getSource()).getValue(); value = value.replace("x", ""); this.controller.setProfileLengthFactor(Double.parseDouble(value)); - if (this.profilesSameSize.isSelected()) + if (this.profilesSameSize.isSelected()) { this.profileWidthSpinner.setValue(this.profileLengthSpinner.getValue()); + } } - public void profilesSameSizeStateChanged(ChangeEvent e) - { - if (((JCheckBox)e.getSource()).isSelected()) + public void profilesSameSizeStateChanged(ChangeEvent e) { + if (((JCheckBox) e.getSource()).isSelected()) { this.profileLengthSpinner.setValue(this.profileWidthSpinner.getValue()); + } } - public void profileFollowPathStateChanged(ChangeEvent e) - { - this.controller.setWholeTrackLength(((JCheckBox)e.getSource()).isSelected()); + public void profileFollowPathStateChanged(ChangeEvent e) { + this.controller.setWholeTrackLength(((JCheckBox) e.getSource()).isSelected()); } - public void updatePosition(Position position, Angle heading) - { + public void updatePosition(Position position, Angle heading) { this.controller.updatePosition(position, heading); } - public void updatePath(ArrayList positions) - { + public void updatePath(ArrayList positions) { this.controller.updatePath(positions); } - public String getFollow() - { + public String getFollow() { return this.controller.getFollow(); } - private void initComponents() - { + private void initComponents() { this.panel1 = new JPanel(); this.panel2 = new JPanel(); this.panel6 = new JPanel(); @@ -241,109 +249,109 @@ private void initComponents() //======== panel1 ======== { - this.panel1.setLayout(new BorderLayout(20, 20)); - - //======== panel2 ======== - { - this.panel2.setLayout(new GridLayout(1, 2, 20, 10)); - - //======== panel6 ======== - { - this.panel6.setLayout(new GridLayout(1, 2, 20, 10)); - - //======== panel5 ======== - { - this.panel5.setLayout(new BorderLayout(5, 5)); - - //---- sizeComboBox ---- - this.sizeComboBox.setModel(new DefaultComboBoxModel(new String[] { - GRAPH_SIZE_SMALL_TEXT, - GRAPH_SIZE_MEDIUM_TEXT, - GRAPH_SIZE_LARGE_TEXT - })); - this.sizeComboBox.setToolTipText("Size of profile graph"); - this.sizeComboBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - sizeComboBoxActionPerformed(e); - } - }); - this.panel5.add(this.sizeComboBox, BorderLayout.CENTER); - } - this.panel6.add(this.panel5); - - //======== panel7 ======== - { - this.panel7.setLayout(new BorderLayout(5, 5)); - - //---- followComboBox ---- - this.followComboBox.setModel(new DefaultComboBoxModel(new String[] { - FOLLOW_VIEW_TEXT, - FOLLOW_CURSOR_TEXT, - //FOLLOW_EYE_TEXT, - FOLLOW_OBJECT_TEXT, + this.panel1.setLayout(new BorderLayout(20, 20)); + + //======== panel2 ======== + { + this.panel2.setLayout(new GridLayout(1, 2, 20, 10)); + + //======== panel6 ======== + { + this.panel6.setLayout(new GridLayout(1, 2, 20, 10)); + + //======== panel5 ======== + { + this.panel5.setLayout(new BorderLayout(5, 5)); + + //---- sizeComboBox ---- + this.sizeComboBox.setModel(new DefaultComboBoxModel(new String[]{ + GRAPH_SIZE_SMALL_TEXT, + GRAPH_SIZE_MEDIUM_TEXT, + GRAPH_SIZE_LARGE_TEXT + })); + this.sizeComboBox.setToolTipText("Size of profile graph"); + this.sizeComboBox.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + sizeComboBoxActionPerformed(e); + } + }); + this.panel5.add(this.sizeComboBox, BorderLayout.CENTER); + } + this.panel6.add(this.panel5); + + //======== panel7 ======== + { + this.panel7.setLayout(new BorderLayout(5, 5)); + + //---- followComboBox ---- + this.followComboBox.setModel(new DefaultComboBoxModel(new String[]{ + FOLLOW_VIEW_TEXT, + FOLLOW_CURSOR_TEXT, + //FOLLOW_EYE_TEXT, + FOLLOW_OBJECT_TEXT, FOLLOW_NONE_TEXT })); - this.followComboBox.setToolTipText("Set profile behavior"); - this.followComboBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - followComboBoxActionPerformed(e); - } - }); - this.panel7.add(this.followComboBox, BorderLayout.CENTER); - } - this.panel6.add(this.panel7); - } - this.panel2.add(this.panel6); - } - this.panel1.add(this.panel2, BorderLayout.NORTH); - - //======== panel3 ======== - { - this.panel3.setLayout(new GridLayout(1, 3, 10, 10)); - - //---- proportionalCheckBox ---- - this.proportionalCheckBox.setText("Proportional"); - this.proportionalCheckBox.setToolTipText("Maintain 1:1 profile dimensions"); - this.proportionalCheckBox.setAlignmentX(0.5F); - this.proportionalCheckBox.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - proportionalCheckBoxItemStateChanged(e); - } - }); - this.panel3.add(this.proportionalCheckBox); - - //---- showEyeCheckBox ---- - this.showEyeCheckBox.setText("Show A/C Position"); - this.showEyeCheckBox.setToolTipText("Show aircraft position in profile graph"); - this.showEyeCheckBox.setAlignmentX(0.5F); - this.showEyeCheckBox.setHorizontalAlignment(SwingConstants.CENTER); - this.showEyeCheckBox.setSelected(true); - this.showEyeCheckBox.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - showEyeCheckBoxItemStateChanged(e); - } - }); - this.panel3.add(this.showEyeCheckBox); - - //---- zeroBaseCheckBox ---- - this.zeroBaseCheckBox.setText("MSL Base"); - this.zeroBaseCheckBox.setToolTipText("Show mean sea level in profile graph"); - this.zeroBaseCheckBox.setAlignmentX(0.5F); - this.zeroBaseCheckBox.setHorizontalAlignment(SwingConstants.TRAILING); - this.zeroBaseCheckBox.setSelected(true); - this.zeroBaseCheckBox.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - zeroBaseCheckBoxItemStateChanged(e); - } - }); - this.panel3.add(this.zeroBaseCheckBox); - } - this.panel1.add(this.panel3, BorderLayout.CENTER); + this.followComboBox.setToolTipText("Set profile behavior"); + this.followComboBox.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + followComboBoxActionPerformed(e); + } + }); + this.panel7.add(this.followComboBox, BorderLayout.CENTER); + } + this.panel6.add(this.panel7); + } + this.panel2.add(this.panel6); + } + this.panel1.add(this.panel2, BorderLayout.NORTH); + + //======== panel3 ======== + { + this.panel3.setLayout(new GridLayout(1, 3, 10, 10)); + + //---- proportionalCheckBox ---- + this.proportionalCheckBox.setText("Proportional"); + this.proportionalCheckBox.setToolTipText("Maintain 1:1 profile dimensions"); + this.proportionalCheckBox.setAlignmentX(0.5F); + this.proportionalCheckBox.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + proportionalCheckBoxItemStateChanged(e); + } + }); + this.panel3.add(this.proportionalCheckBox); + + //---- showEyeCheckBox ---- + this.showEyeCheckBox.setText("Show A/C Position"); + this.showEyeCheckBox.setToolTipText("Show aircraft position in profile graph"); + this.showEyeCheckBox.setAlignmentX(0.5F); + this.showEyeCheckBox.setHorizontalAlignment(SwingConstants.CENTER); + this.showEyeCheckBox.setSelected(true); + this.showEyeCheckBox.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + showEyeCheckBoxItemStateChanged(e); + } + }); + this.panel3.add(this.showEyeCheckBox); + + //---- zeroBaseCheckBox ---- + this.zeroBaseCheckBox.setText("MSL Base"); + this.zeroBaseCheckBox.setToolTipText("Show mean sea level in profile graph"); + this.zeroBaseCheckBox.setAlignmentX(0.5F); + this.zeroBaseCheckBox.setHorizontalAlignment(SwingConstants.TRAILING); + this.zeroBaseCheckBox.setSelected(true); + this.zeroBaseCheckBox.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + zeroBaseCheckBoxItemStateChanged(e); + } + }); + this.panel3.add(this.zeroBaseCheckBox); + } + this.panel1.add(this.panel3, BorderLayout.CENTER); //======== panel8 ======== { this.panel8.setLayout(new GridLayout(2, 2, 20, 10)); - String[] profileSizeValues = new String[] {"x1", "x2", "x3", "x4", "x5", "x7", "x10"}; + String[] profileSizeValues = new String[]{"x1", "x2", "x3", "x4", "x5", "x7", "x10"}; //======== panel4 ======== { @@ -454,17 +462,15 @@ public void stateChanged(ChangeEvent e) { private JPanel panel4d; private JCheckBox profileFollowPath; - private static class TerrainProfileController - { + private static class TerrainProfileController { + private static final HashMap sizes = new HashMap(); - public static String[] getSizeKeys() - { + public static String[] getSizeKeys() { return sizes.keySet().toArray(new String[1]); } - static - { + static { sizes.put(GRAPH_SIZE_SMALL_TEXT, new Dimension(250, 100)); sizes.put(GRAPH_SIZE_MEDIUM_TEXT, new Dimension(450, 140)); sizes.put(GRAPH_SIZE_LARGE_TEXT, new Dimension(655, 240)); @@ -472,13 +478,11 @@ public static String[] getSizeKeys() private static final HashMap follows = new HashMap(); - public static String[] getFollowKeys() - { + public static String[] getFollowKeys() { return follows.keySet().toArray(new String[1]); } - static - { + static { follows.put(FOLLOW_VIEW_TEXT, TerrainProfileLayer.FOLLOW_VIEW); follows.put(FOLLOW_CURSOR_TEXT, TerrainProfileLayer.FOLLOW_CURSOR); //follows.put(FOLLOW_EYE_TEXT, TerrainProfileLayer.FOLLOW_EYE); @@ -491,8 +495,7 @@ public static String[] getFollowKeys() private TerrainProfileLayer tpl2; // Parallel to the track private boolean wholeTrackLength = false; - public TerrainProfileController() - { + public TerrainProfileController() { this.tpl = new TerrainProfileLayer(); this.tpl.setZeroBased(true); this.tpl2 = new TerrainProfileLayer(); @@ -500,143 +503,125 @@ public TerrainProfileController() this.tpl2.setPosition(AVKey.SOUTHEAST); } - public WorldWindow getWwd() - { + public WorldWindow getWwd() { return wwd; } - public void setWwd(WorldWindow wwd) - { + public void setWwd(WorldWindow wwd) { this.wwd = wwd; - if (this.wwd != null) - { + if (this.wwd != null) { ApplicationTemplate.insertBeforeCompass(wwd, tpl); this.tpl.setEventSource(wwd); ApplicationTemplate.insertBeforeCompass(wwd, tpl2); this.tpl2.setEventSource(wwd); - this.tpl2.setPathType(Polyline.RHUMB_LINE); + this.tpl2.setPathType(AVKey.RHUMB_LINE); // Move scalebar to north west - for (Layer layer : wwd.getModel().getLayers()) - if (layer instanceof ScalebarLayer) - ((ScalebarLayer)layer).setPosition(AVKey.NORTHWEST); + for (Layer layer : wwd.getModel().getLayers()) { + if (layer instanceof ScalebarLayer) { + ((ScalebarLayer) layer).setPosition(AVKey.NORTHWEST); + } + } update(); } } - private void update() - { - if (this.wwd != null) + private void update() { + if (this.wwd != null) { this.wwd.redraw(); + } } - public void setShowEyePosition(boolean showEye) - { + public void setShowEyePosition(boolean showEye) { this.tpl.setShowEyePosition(showEye); this.tpl2.setShowEyePosition(showEye); this.update(); } - public boolean getShowEyePosition() - { + public boolean getShowEyePosition() { return this.tpl.getShowEyePosition(); } - public void setZeroBased(boolean keepProportions) - { + public void setZeroBased(boolean keepProportions) { this.tpl.setZeroBased(keepProportions); this.tpl2.setZeroBased(keepProportions); this.update(); } - public boolean getShowZeroBased() - { + public boolean getShowZeroBased() { return this.tpl.getZeroBased(); } - public void setKeepProportions(boolean keepProportions) - { + public void setKeepProportions(boolean keepProportions) { this.tpl.setKeepProportions(keepProportions); this.tpl2.setKeepProportions(keepProportions); this.update(); } - public boolean getKeepProportions() - { + public boolean getKeepProportions() { return this.tpl.getKeepProportions(); } - public void setProfileSize(String size) - { + public void setProfileSize(String size) { Dimension dim = sizes.get(size); - if (dim != null) - { + if (dim != null) { this.tpl.setSize(dim); this.tpl2.setSize(dim); this.update(); } } - public Dimension getProfileSize() - { + public Dimension getProfileSize() { return this.tpl.getSize(); } - public void setFollow(String followName) - { + public void setFollow(String followName) { String follow = follows.get(followName); - if (follow != null) - { + if (follow != null) { this.tpl.setFollow(follow); - if (follow.equals(TerrainProfileLayer.FOLLOW_OBJECT) || follow.equals(TerrainProfileLayer.FOLLOW_EYE)) + if (follow.equals(TerrainProfileLayer.FOLLOW_OBJECT) || follow.equals(TerrainProfileLayer.FOLLOW_EYE)) { this.tpl2.setFollow( - this.wholeTrackLength ? TerrainProfileLayer.FOLLOW_PATH : TerrainProfileLayer.FOLLOW_OBJECT); - else + this.wholeTrackLength ? TerrainProfileLayer.FOLLOW_PATH : TerrainProfileLayer.FOLLOW_OBJECT); + } else { this.tpl2.setFollow(TerrainProfileLayer.FOLLOW_NONE); + } this.update(); } } - public String getFollow() - { + public String getFollow() { return this.tpl.getFollow(); } - public void setWholeTrackLength(boolean state) - { - if (this.wholeTrackLength != state) - { + public void setWholeTrackLength(boolean state) { + if (this.wholeTrackLength != state) { this.wholeTrackLength = state; - if (!this.tpl2.getFollow().equals(TerrainProfileLayer.FOLLOW_NONE)) + if (!this.tpl2.getFollow().equals(TerrainProfileLayer.FOLLOW_NONE)) { this.tpl2.setFollow( - this.wholeTrackLength ? TerrainProfileLayer.FOLLOW_PATH : TerrainProfileLayer.FOLLOW_OBJECT); + this.wholeTrackLength ? TerrainProfileLayer.FOLLOW_PATH : TerrainProfileLayer.FOLLOW_OBJECT); + } this.update(); } } - public void setProfileWidthFactor(double factor) - { + public void setProfileWidthFactor(double factor) { this.tpl.setProfileLengthFactor(factor); // perpendicular profile this.update(); } - public void setProfileLengthFactor(double factor) - { + public void setProfileLengthFactor(double factor) { this.tpl2.setProfileLengthFactor(factor); // along track rofile this.update(); } - public double getProfileWidthFactor() - { + public double getProfileWidthFactor() { return this.tpl.getProfileLenghtFactor(); } - public double getProfileLengthFactor() - { + public double getProfileLengthFactor() { return this.tpl2.getProfileLenghtFactor(); } - public void updatePosition(Position position, Angle heading) - { + public void updatePosition(Position position, Angle heading) { this.tpl.setObjectPosition(position); this.tpl.setObjectHeading(heading); this.tpl2.setObjectPosition(position); @@ -644,39 +629,31 @@ public void updatePosition(Position position, Angle heading) this.update(); } - public void updatePath(ArrayList positions) - { + public void updatePath(ArrayList positions) { this.tpl2.setPathPositions(positions); this.update(); } } // *** Restorable interface *** - - public String getRestorableState() - { + public String getRestorableState() { RestorableSupport rs = RestorableSupport.newRestorableSupport(); this.doGetRestorableState(rs, null); return rs.getStateAsXml(); } - public void restoreState(String stateInXml) - { - if (stateInXml == null) - { + public void restoreState(String stateInXml) { + if (stateInXml == null) { String message = Logging.getMessage("nullValue.StringIsNull"); Logging.logger().severe(message); throw new IllegalArgumentException(message); } RestorableSupport rs; - try - { + try { rs = RestorableSupport.parse(stateInXml); - } - catch (Exception e) - { + } catch (Exception e) { // Parsing the document specified by stateInXml failed. String message = Logging.getMessage("generic.ExceptionAttemptingToParseStateXml", stateInXml); Logging.logger().severe(message); @@ -686,58 +663,65 @@ public void restoreState(String stateInXml) this.doRestoreState(rs, null); } - protected void doGetRestorableState(RestorableSupport rs, RestorableSupport.StateObject context) - { + protected void doGetRestorableState(RestorableSupport rs, RestorableSupport.StateObject context) { // Add state values - rs.addStateValueAsString(context, "size", (String)this.sizeComboBox.getSelectedItem()); - rs.addStateValueAsString(context, "follow", (String)this.followComboBox.getSelectedItem()); + rs.addStateValueAsString(context, "size", (String) this.sizeComboBox.getSelectedItem()); + rs.addStateValueAsString(context, "follow", (String) this.followComboBox.getSelectedItem()); rs.addStateValueAsBoolean(context, "proportional", this.proportionalCheckBox.isSelected()); rs.addStateValueAsBoolean(context, "zeroBase", this.zeroBaseCheckBox.isSelected()); rs.addStateValueAsBoolean(context, "showEye", this.showEyeCheckBox.isSelected()); - rs.addStateValueAsString(context, "width", (String)this.profileWidthSpinner.getValue()); - rs.addStateValueAsString(context, "length", (String)this.profileLengthSpinner.getValue()); + rs.addStateValueAsString(context, "width", (String) this.profileWidthSpinner.getValue()); + rs.addStateValueAsString(context, "length", (String) this.profileLengthSpinner.getValue()); rs.addStateValueAsBoolean(context, "sameSize", this.profilesSameSize.isSelected()); rs.addStateValueAsBoolean(context, "followPath", this.profileFollowPath.isSelected()); } - protected void doRestoreState(RestorableSupport rs, RestorableSupport.StateObject context) - { + protected void doRestoreState(RestorableSupport rs, RestorableSupport.StateObject context) { // Retrieve state values String sizeState = rs.getStateValueAsString(context, "size"); - if (sizeState != null) + if (sizeState != null) { this.sizeComboBox.setSelectedItem(sizeState); + } String followState = rs.getStateValueAsString(context, "follow"); - if (followState != null) + if (followState != null) { this.followComboBox.setSelectedItem(followState); + } Boolean proportionalState = rs.getStateValueAsBoolean(context, "proportional"); - if (proportionalState != null) + if (proportionalState != null) { this.proportionalCheckBox.setSelected(proportionalState); + } Boolean zeroBaseState = rs.getStateValueAsBoolean(context, "zeroBase"); - if (zeroBaseState != null) + if (zeroBaseState != null) { this.zeroBaseCheckBox.setSelected(zeroBaseState); + } Boolean showEyeState = rs.getStateValueAsBoolean(context, "showEye"); - if (showEyeState != null) + if (showEyeState != null) { this.showEyeCheckBox.setSelected(showEyeState); + } String widthState = rs.getStateValueAsString(context, "width"); - if (widthState != null) + if (widthState != null) { this.profileWidthSpinner.setValue(widthState); + } String lengthState = rs.getStateValueAsString(context, "length"); - if (lengthState != null) + if (lengthState != null) { this.profileLengthSpinner.setValue(lengthState); + } Boolean sameSizeState = rs.getStateValueAsBoolean(context, "sameSize"); - if (sameSizeState != null) + if (sameSizeState != null) { this.profilesSameSize.setSelected(sameSizeState); + } Boolean followPathState = rs.getStateValueAsBoolean(context, "followPath"); - if (followPathState != null) + if (followPathState != null) { this.profileFollowPath.setSelected(followPathState); + } } } diff --git a/src/gov/nasa/worldwindx/applications/sar/TrackController.java b/src/gov/nasa/worldwindx/applications/sar/TrackController.java index b95bf66396..ae4eded386 100644 --- a/src/gov/nasa/worldwindx/applications/sar/TrackController.java +++ b/src/gov/nasa/worldwindx/applications/sar/TrackController.java @@ -1,10 +1,33 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; +import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.WorldWindow; import gov.nasa.worldwind.event.*; import gov.nasa.worldwind.geom.*; @@ -22,8 +45,8 @@ * @author tag * @version $Id: TrackController.java 1171 2013-02-11 21:45:02Z dcollins $ */ -public class TrackController -{ +public class TrackController { + public static final String TRACK_ADD = "TrackController.TrackAdded"; public static final String TRACK_CURRENT = "TrackController.TrackCurrent"; public static final String TRACK_DIRTY_BIT = "TrackController.TrackDirtyBit"; @@ -50,100 +73,110 @@ public class TrackController private SARTrackBuilder trackBuilder; private SARTrackExtensionTool trackExtensionTool; - private final SelectListener selectListener = new SelectListener() - { - public void selected(SelectEvent event) - { - if (event == null) + private final SelectListener selectListener = new SelectListener() { + public void selected(SelectEvent event) { + if (event == null) { return; + } onSelected(event); } }; - public TrackController() - { + public TrackController() { this.trackBuilder = new SARTrackBuilder(); this.trackExtensionTool = new SARTrackExtensionTool(); } - public WorldWindow getWwd() - { + public WorldWindow getWwd() { return wwd; } - public void setWwd(WorldWindow wwd) - { - if (wwd == this.wwd) + public void setWwd(WorldWindow wwd) { + if (wwd == this.wwd) { return; + } - if (this.wwd != null) + if (this.wwd != null) { this.wwd.removeSelectListener(this.selectListener); + } this.wwd = wwd; - if (this.wwd != null) + if (this.wwd != null) { this.wwd.addSelectListener(this.selectListener); + } this.trackBuilder.setWwd(this.wwd); this.trackExtensionTool.setWorldWindow(this.wwd); } - public TracksPanel getTracksPanel() - { + public TracksPanel getTracksPanel() { return tracksPanel; } - public void setTracksPanel(TracksPanel tracksPanel) - { + public void setTracksPanel(TracksPanel tracksPanel) { this.tracksPanel = tracksPanel; } - public AnalysisPanel getAnalysisPanel() - { + public AnalysisPanel getAnalysisPanel() { return analysisPanel; } - public void setAnalysisPanel(AnalysisPanel analysisPanel) - { + public void setAnalysisPanel(AnalysisPanel analysisPanel) { this.analysisPanel = analysisPanel; this.analysisPanel.setTrackController(this); } - public void addTrack(SARTrack track) - { - if (track == null) + public void addTrack(SARTrack track) { + if (track == null) { return; + } - this.createPolylineTrackRepresentation(track); - - track.addPropertyChangeListener(new PropertyChangeListener() - { - @SuppressWarnings({"StringEquality"}) - public void propertyChange(PropertyChangeEvent propertyChangeEvent) - { - if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_REMOVE) - removeTrack((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_MODIFY) - updateTrack((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_ENABLE) - enableTrack((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_DISABLE) - disableTrack((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_CURRENT) - trackCurrent((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_NAME) - trackName((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.TRACK_DIRTY_BIT) - trackDirtyBit((SARTrack) propertyChangeEvent.getSource()); - else if (propertyChangeEvent.getPropertyName() == TrackController.BEGIN_TRACK_POINT_ENTRY) - beginTrackPointEntry(propertyChangeEvent); - else if (propertyChangeEvent.getPropertyName() == TrackController.END_TRACK_POINT_ENTRY) - endTrackPointEntry(propertyChangeEvent); - else if (propertyChangeEvent.getPropertyName() == TrackController.MOVE_TO_NEXT_POINT) - moveToNextTrackPoint(); - else if (propertyChangeEvent.getPropertyName() == TrackController.REMOVE_LAST_POINT) - removeLastTrackPoint(); + this.createPathTrackRepresentation(track); + + track.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent propertyChangeEvent) { + if (null != propertyChangeEvent.getPropertyName()) { + switch (propertyChangeEvent.getPropertyName()) { + case TrackController.TRACK_REMOVE: + removeTrack((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.TRACK_MODIFY: + updateTrack((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.TRACK_ENABLE: + enableTrack((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.TRACK_DISABLE: + disableTrack((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.TRACK_CURRENT: + trackCurrent((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.TRACK_NAME: + trackName((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.TRACK_DIRTY_BIT: + trackDirtyBit((SARTrack) propertyChangeEvent.getSource()); + break; + case TrackController.BEGIN_TRACK_POINT_ENTRY: + beginTrackPointEntry(propertyChangeEvent); + break; + case TrackController.END_TRACK_POINT_ENTRY: + endTrackPointEntry(propertyChangeEvent); + break; + case TrackController.MOVE_TO_NEXT_POINT: + moveToNextTrackPoint(); + break; + case TrackController.REMOVE_LAST_POINT: + removeLastTrackPoint(); + break; + default: + break; + } + } } }); @@ -151,104 +184,106 @@ else if (propertyChangeEvent.getPropertyName() == TrackController.REMOVE_LAST_PO this.moveToTrack(track); } - public SARTrack getCurrentTrack() - { + public SARTrack getCurrentTrack() { return this.tracksPanel.getCurrentTrack(); } - public void refreshCurrentTrack() - { + public void refreshCurrentTrack() { trackCurrent(getCurrentTrack()); } - private void createPolylineTrackRepresentation(SARTrack track) - { - Polyline airPath = new Polyline(track); + private void createPathTrackRepresentation(SARTrack track) { + Path airPath = new Path(track); airPath.setOffset(track.getOffset()); - airPath.setPathType(Polyline.RHUMB_LINE); - airPath.setColor(track.getColor()); - - Polyline groundPath = new Polyline(track); - groundPath.setFollowTerrain(true); - groundPath.setPathType(Polyline.RHUMB_LINE); - groundPath.setColor(track.getColor()); - groundPath.setStippleFactor(5); - groundPath.setStipplePattern((short) 0xAAAA); + airPath.setPathType(AVKey.RHUMB_LINE); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(track.getColor())); + airPath.setAttributes(attrs); + + Path groundPath = new Path(track); + groundPath.setSurfacePath(true); + groundPath.setPathType(AVKey.RHUMB_LINE); + attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(track.getColor())); + attrs.setOutlineStippleFactor(5); + attrs.setOutlineStipplePattern((short) 0xAAAA); + groundPath.setAttributes(attrs); RenderableLayer layer = new RenderableLayer(); layer.addRenderable(airPath); layer.addRenderable(groundPath); this.wwd.getModel().getLayers().add(layer); - if (this.wwd != null) + if (this.wwd != null) { this.wwd.redraw(); + } this.trackLayers.put(track, layer); } - private void removeTrack(SARTrack track) - { + private void removeTrack(SARTrack track) { Layer layer = this.trackLayers.get(track); - if (layer == null) + if (layer == null) { return; + } this.trackLayers.remove(track); this.wwd.getModel().getLayers().remove(layer); - if (this.wwd != null) + if (this.wwd != null) { this.wwd.redraw(); + } } - private void enableTrack(SARTrack track) - { + private void enableTrack(SARTrack track) { RenderableLayer layer = (RenderableLayer) this.trackLayers.get(track); - if (layer == null) + if (layer == null) { return; + } layer.setEnabled(true); - if (this.wwd != null) + if (this.wwd != null) { this.wwd.redraw(); + } } - private void disableTrack(SARTrack track) - { + private void disableTrack(SARTrack track) { RenderableLayer layer = (RenderableLayer) this.trackLayers.get(track); - if (layer == null) + if (layer == null) { return; + } layer.setEnabled(false); - if (this.wwd != null) + if (this.wwd != null) { this.wwd.redraw(); + } } - private void updateTrack(SARTrack track) - { + private void updateTrack(SARTrack track) { RenderableLayer layer = (RenderableLayer) this.trackLayers.get(track); - if (layer == null) + if (layer == null) { return; + } - for (Renderable r : layer.getRenderables()) - { - Polyline line = (Polyline) r; + for (Renderable r : layer.getRenderables()) { + Path line = (Path) r; line.setPositions(track); - if (!line.isFollowTerrain()) + if (!line.isFollowTerrain()) { line.setOffset(track.getOffset()); + } } - if (this.wwd != null) - { + if (this.wwd != null) { this.wwd.redraw(); } } - private void trackCurrent(SARTrack track) - { + private void trackCurrent(SARTrack track) { this.analysisPanel.setCurrentTrack(track); - if (this.isExtending() && track != null) + if (this.isExtending() && track != null) { endTrackPointEntry(new PropertyChangeEvent(track, END_TRACK_POINT_ENTRY, null, null)); + } // Adjust track line width - for (SARTrack st : this.trackLayers.keySet()) - { - if (st != track) - { + for (SARTrack st : this.trackLayers.keySet()) { + if (st != track) { this.setTrackLayerLineWidth(st, 1); } } @@ -258,30 +293,24 @@ private void trackCurrent(SARTrack track) } @SuppressWarnings({"UnusedDeclaration"}) - private void trackName(SARTrack track) - { + private void trackName(SARTrack track) { // Intentionally left blank, as a placeholder for future functionality. } @SuppressWarnings({"UnusedDeclaration"}) - private void trackDirtyBit(SARTrack track) - { + private void trackDirtyBit(SARTrack track) { // Intentionally left blank, as a placeholder for future functionality. } - private void beginTrackPointEntry(PropertyChangeEvent event) - { + private void beginTrackPointEntry(PropertyChangeEvent event) { SARTrack track = (SARTrack) event.getSource(); - if (event.getNewValue().equals(EXTENSION_PLANE)) - { + if (event.getNewValue().equals(EXTENSION_PLANE)) { this.trackExtensionTool.setArmed(false); this.trackExtensionTool.setTrack(track); this.trackExtensionTool.setArmed(true); - } - else - { + } else { this.trackBuilder.setArmed(false); this.trackBuilder.setTrack(track); @@ -295,8 +324,7 @@ private void beginTrackPointEntry(PropertyChangeEvent event) this.analysisPanel.gotoTrackEnd(); } - private void endTrackPointEntry(PropertyChangeEvent event) - { + private void endTrackPointEntry(PropertyChangeEvent event) { this.trackBuilder.setArmed(false); this.trackExtensionTool.setArmed(false); @@ -304,133 +332,119 @@ private void endTrackPointEntry(PropertyChangeEvent event) this.wwd.firePropertyChange(event); } - private void moveToNextTrackPoint() - { - if (this.trackExtensionTool.isArmed() && this.trackExtensionTool.canMoveToNextTrackPoint()) + private void moveToNextTrackPoint() { + if (this.trackExtensionTool.isArmed() && this.trackExtensionTool.canMoveToNextTrackPoint()) { this.trackExtensionTool.moveToNextTrackPoint(); + } } - private void removeLastTrackPoint() - { - if (this.trackBuilder.isArmed() && this.trackBuilder.canRemoveLastTrackPoint()) + private void removeLastTrackPoint() { + if (this.trackBuilder.isArmed() && this.trackBuilder.canRemoveLastTrackPoint()) { this.trackBuilder.removeLastTrackPoint(); - else if (this.trackExtensionTool.isArmed() && this.trackExtensionTool.canRemoveLastTrackPoint()) + } else if (this.trackExtensionTool.isArmed() && this.trackExtensionTool.canRemoveLastTrackPoint()) { this.trackExtensionTool.removeLastTrackPoint(); + } } - public boolean isExtending() - { + public boolean isExtending() { return this.trackBuilder.isArmed() || this.trackExtensionTool.isArmed(); } //move to the first position in a track - private void moveToTrack(SARTrack track) - { + private void moveToTrack(SARTrack track) { OrbitView view = (OrbitView) this.wwd.getView(); - if (!track.getPositions().isEmpty()) - { + if (!track.getPositions().isEmpty()) { Position pos = track.getPositions().get(0); ((BasicOrbitView) view).addPanToAnimator(pos, view.getHeading(), Angle.ZERO, 10000, true); } } - protected void onSelected(SelectEvent event) - { + protected void onSelected(SelectEvent event) { SARTrack track = this.getPickedTrack(event.getTopPickedObject()); - if (event.getEventAction().equals(SelectEvent.LEFT_CLICK)) - { - if (track != null) + if (event.getEventAction().equals(SelectEvent.LEFT_CLICK)) { + if (track != null) { this.onTrackClicked(track); - } - else if (event.getEventAction().equals(SelectEvent.ROLLOVER)) - { + } + } else if (event.getEventAction().equals(SelectEvent.ROLLOVER)) { this.onTrackRollover(track); - } - else if (event.getEventAction().equals(SelectEvent.HOVER)) - { + } else if (event.getEventAction().equals(SelectEvent.HOVER)) { this.onTrackHover(track); } } - protected SARTrack getPickedTrack(PickedObject pickedObject) - { - if (pickedObject == null) + protected SARTrack getPickedTrack(PickedObject pickedObject) { + if (pickedObject == null) { return null; + } Layer layer = pickedObject.getParentLayer(); - if (layer == null) + if (layer == null) { return null; + } return this.getTrackForLayer(layer); } - protected void onTrackClicked(SARTrack track) - { + protected void onTrackClicked(SARTrack track) { this.tracksPanel.setCurrentTrack(track); } - protected void onTrackRollover(SARTrack track) - { - for (SARTrack st : this.trackLayers.keySet()) - { - if (st != track) - { + protected void onTrackRollover(SARTrack track) { + for (SARTrack st : this.trackLayers.keySet()) { + if (st != track) { this.setTrackLayerColor(st, st.getColor()); } } - if (track != null) - { + if (track != null) { Color rolloverColor = WWUtil.makeColorDarker(track.getColor()); this.setTrackLayerColor(track, rolloverColor); } } - protected void onTrackHover(SARTrack track) - { + protected void onTrackHover(SARTrack track) { // TODO: show tool tip with track name } - private void setTrackLayerColor(SARTrack track, Color color) - { + private void setTrackLayerColor(SARTrack track, Color color) { RenderableLayer layer = (RenderableLayer) this.trackLayers.get(track); - if (layer == null) + if (layer == null) { return; + } - for (Renderable r : layer.getRenderables()) - { - Polyline line = (Polyline) r; - line.setColor(color); + for (Renderable r : layer.getRenderables()) { + Path line = (Path) r; + line.getActiveAttributes().setOutlineMaterial(new Material(color)); } - if (this.wwd != null) + if (this.wwd != null) { this.wwd.redraw(); + } } - private void setTrackLayerLineWidth(SARTrack track, double width) - { + private void setTrackLayerLineWidth(SARTrack track, double width) { RenderableLayer layer = (RenderableLayer) this.trackLayers.get(track); - if (layer == null) + if (layer == null) { return; + } - for (Renderable r : layer.getRenderables()) - { - Polyline line = (Polyline) r; - line.setLineWidth(width); + for (Renderable r : layer.getRenderables()) { + Path line = (Path) r; + line.getActiveAttributes().setOutlineWidth(width); } - if (this.wwd != null) + if (this.wwd != null) { this.wwd.redraw(); + } } - private SARTrack getTrackForLayer(Layer layer) - { - for (Map.Entry entry : this.trackLayers.entrySet()) - { - if (entry.getValue() == layer) + private SARTrack getTrackForLayer(Layer layer) { + for (Map.Entry entry : this.trackLayers.entrySet()) { + if (entry.getValue() == layer) { return entry.getKey(); + } } return null; diff --git a/src/gov/nasa/worldwindx/applications/sar/TrackPanel.java b/src/gov/nasa/worldwindx/applications/sar/TrackPanel.java index b723768397..efc8496b97 100644 --- a/src/gov/nasa/worldwindx/applications/sar/TrackPanel.java +++ b/src/gov/nasa/worldwindx/applications/sar/TrackPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/TrackViewPanel.java b/src/gov/nasa/worldwindx/applications/sar/TrackViewPanel.java index 8e0c361012..f6fcb1c2a1 100644 --- a/src/gov/nasa/worldwindx/applications/sar/TrackViewPanel.java +++ b/src/gov/nasa/worldwindx/applications/sar/TrackViewPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/TracksPanel.java b/src/gov/nasa/worldwindx/applications/sar/TracksPanel.java index b7078c751e..597559d800 100644 --- a/src/gov/nasa/worldwindx/applications/sar/TracksPanel.java +++ b/src/gov/nasa/worldwindx/applications/sar/TracksPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/UserPreferenceUtils.java b/src/gov/nasa/worldwindx/applications/sar/UserPreferenceUtils.java index 744b4c8505..c07db8ec84 100644 --- a/src/gov/nasa/worldwindx/applications/sar/UserPreferenceUtils.java +++ b/src/gov/nasa/worldwindx/applications/sar/UserPreferenceUtils.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java b/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java index 1786a1e69b..230aecba01 100644 --- a/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java +++ b/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; @@ -45,7 +67,7 @@ public void setWwd(WorldWindow wwdInstance) // Terrain profile JMenuItem mi = new JMenuItem("Terrain profile..."); mi.setMnemonic('T'); - mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); + mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx())); mi.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) @@ -58,7 +80,7 @@ public void actionPerformed(ActionEvent event) // Cloud ceiling contour mi = new JMenuItem("Cloud Contour..."); mi.setMnemonic('C'); - mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); + mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx())); mi.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) diff --git a/src/gov/nasa/worldwindx/applications/sar/WWPanel.java b/src/gov/nasa/worldwindx/applications/sar/WWPanel.java index 5e30396744..1d0442cd8b 100644 --- a/src/gov/nasa/worldwindx/applications/sar/WWPanel.java +++ b/src/gov/nasa/worldwindx/applications/sar/WWPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar; diff --git a/src/gov/nasa/worldwindx/applications/sar/actions/AddOffsetToPositionsAction.java b/src/gov/nasa/worldwindx/applications/sar/actions/AddOffsetToPositionsAction.java index 2364d056b7..9141254889 100644 --- a/src/gov/nasa/worldwindx/applications/sar/actions/AddOffsetToPositionsAction.java +++ b/src/gov/nasa/worldwindx/applications/sar/actions/AddOffsetToPositionsAction.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.actions; diff --git a/src/gov/nasa/worldwindx/applications/sar/actions/AppendPositionAction.java b/src/gov/nasa/worldwindx/applications/sar/actions/AppendPositionAction.java index 4a11862633..1ab989bb03 100644 --- a/src/gov/nasa/worldwindx/applications/sar/actions/AppendPositionAction.java +++ b/src/gov/nasa/worldwindx/applications/sar/actions/AppendPositionAction.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.actions; diff --git a/src/gov/nasa/worldwindx/applications/sar/actions/DeletePositionsAction.java b/src/gov/nasa/worldwindx/applications/sar/actions/DeletePositionsAction.java index d81ad979a6..4e2c7d9621 100644 --- a/src/gov/nasa/worldwindx/applications/sar/actions/DeletePositionsAction.java +++ b/src/gov/nasa/worldwindx/applications/sar/actions/DeletePositionsAction.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.actions; diff --git a/src/gov/nasa/worldwindx/applications/sar/actions/InsertPositionAction.java b/src/gov/nasa/worldwindx/applications/sar/actions/InsertPositionAction.java index dc43891c69..bf341dde4d 100644 --- a/src/gov/nasa/worldwindx/applications/sar/actions/InsertPositionAction.java +++ b/src/gov/nasa/worldwindx/applications/sar/actions/InsertPositionAction.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.actions; diff --git a/src/gov/nasa/worldwindx/applications/sar/actions/SARScreenShotAction.java b/src/gov/nasa/worldwindx/applications/sar/actions/SARScreenShotAction.java index 3c8515c33f..80aa9cc129 100644 --- a/src/gov/nasa/worldwindx/applications/sar/actions/SARScreenShotAction.java +++ b/src/gov/nasa/worldwindx/applications/sar/actions/SARScreenShotAction.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.actions; diff --git a/src/gov/nasa/worldwindx/applications/sar/config/SAR.properties b/src/gov/nasa/worldwindx/applications/sar/config/SAR.properties index 4164270f2a..3a1820c023 100644 --- a/src/gov/nasa/worldwindx/applications/sar/config/SAR.properties +++ b/src/gov/nasa/worldwindx/applications/sar/config/SAR.properties @@ -1,13 +1,35 @@ # -# Copyright (C) 2012 United States Government as represented by the Administrator of the -# National Aeronautics and Space Administration. -# All Rights Reserved. +# Copyright 2006-2009, 2017, 2020 United States Government, as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All rights reserved. +# +# The NASA World Wind Java (WWJ) platform is licensed under the Apache License, +# Version 2.0 (the "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed +# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +# CONDITIONS OF ANY KIND, either express or implied. See the License for the +# specific language governing permissions and limitations under the License. +# +# NASA World Wind Java (WWJ) also contains the following 3rd party Open Source +# software: +# +# Jackson Parser – Licensed under Apache 2.0 +# GDAL – Licensed under MIT +# JOGL – Licensed under Berkeley Software Distribution (BSD) +# Gluegen – Licensed under Berkeley Software Distribution (BSD) +# +# A complete listing of 3rd Party software notices and licenses included in +# NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party +# notices and licenses PDF found in code directory. # # -# Default World Wind Configuration Properties -# Specify configuration values here to override World Wind's default values. -# Lines starting with # are comments and ignored by World Wind. +# Default WorldWind Configuration Properties +# Specify configuration values here to override WorldWind's default values. +# Lines starting with # are comments and ignored by WorldWind. # # @version $Id: SAR.properties 1958 2014-04-24 19:25:37Z tgaskins $ # diff --git a/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java b/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java index d87a76c875..2d9eb42a72 100644 --- a/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java +++ b/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java @@ -1,16 +1,40 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.applications.sar.render; +import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.geom.Angle; import gov.nasa.worldwind.geom.LatLon; import gov.nasa.worldwind.geom.Position; +import gov.nasa.worldwind.render.BasicShapeAttributes; import gov.nasa.worldwind.render.DrawContext; -import gov.nasa.worldwind.render.Polyline; +import gov.nasa.worldwind.render.Material; +import gov.nasa.worldwind.render.Path; import gov.nasa.worldwind.render.Renderable; import gov.nasa.worldwind.util.Logging; @@ -18,8 +42,9 @@ import java.util.ArrayList; /** - * Renders a plane model at a position with a given heading. The plane is parallel to the ground. - * An optional 'shadow' shape is rendered on the ground. + * Renders a plane model at a position with a given heading. The plane is parallel to the ground. An optional 'shadow' + * shape is rendered on the ground. + * * @author Patrick Murris * @version $Id: PlaneModel.java 1171 2013-02-11 21:45:02Z dcollins $ */ @@ -35,33 +60,30 @@ public class PlaneModel implements Renderable { private double shadowScale = 1d; private Color shadowColor = Color.YELLOW; - private Polyline planeModel; - private Polyline shadowModel; + private Path planeModel; + private Path shadowModel; /** * Renders a plane model with the defaul dimensions and color. */ - public PlaneModel() - { + public PlaneModel() { } /** * Renders a plane model with the specified dimensions and color. + * * @param length the plane length in meters * @param width the plane width in meter. * @param color the plane color. */ - public PlaneModel(Double length, Double width, Color color) - { + public PlaneModel(Double length, Double width, Color color) { this.length = length; this.width = width; this.color = color; } - public void setPosition(Position pos) - { - if (pos == null) - { + public void setPosition(Position pos) { + if (pos == null) { String msg = Logging.getMessage("nullValue.PositionIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -70,15 +92,12 @@ public void setPosition(Position pos) clearRenderables(); } - public Position getPosition() - { + public Position getPosition() { return this.position; } - public void setHeading(Angle head) - { - if (head == null) - { + public void setHeading(Angle head) { + if (head == null) { String msg = Logging.getMessage("nullValue.AngleIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -87,89 +106,83 @@ public void setHeading(Angle head) clearRenderables(); } - public Angle getHeading() - { + public Angle getHeading() { return this.heading; } - public void setShowShadow(boolean state) - { + public void setShowShadow(boolean state) { this.showShadow = state; } - public boolean getShowShadow() - { + public boolean getShowShadow() { return this.showShadow; } - public double getShadowScale() - { + public double getShadowScale() { return this.shadowScale; } - public void setShadowScale(double shadowScale) - { + public void setShadowScale(double shadowScale) { this.shadowScale = shadowScale; clearRenderables(); } - public Color getShadowColor() - { + public Color getShadowColor() { return this.shadowColor; } - public void setShadowColor(Color shadowColor) - { + public void setShadowColor(Color shadowColor) { this.shadowColor = shadowColor; clearRenderables(); } - public void render(DrawContext dc) - { - if (dc == null) - { + public void render(DrawContext dc) { + if (dc == null) { String msg = Logging.getMessage("nullValue.DrawContextIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if( this.position == null || this.heading == null) + if (this.position == null || this.heading == null) { return; + } //renderPlane(dc); - - if (this.planeModel == null) + if (this.planeModel == null) { createRenderables(dc); + } this.planeModel.render(dc); - if (this.showShadow && this.shadowModel != null) + if (this.showShadow && this.shadowModel != null) { this.shadowModel.render(dc); + } } - private void createRenderables(DrawContext dc) - { + private void createRenderables(DrawContext dc) { ArrayList positions = computePlaneShape(dc, this.width, this.length); - this.planeModel = new Polyline(positions, this.position.getElevation()); - this.planeModel.setPathType(Polyline.LINEAR); + this.planeModel = new Path(positions, this.position.getElevation()); + this.planeModel.setPathType(AVKey.LINEAR); this.planeModel.setFollowTerrain(false); this.planeModel.setNumSubsegments(1); - this.planeModel.setColor(this.color); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(this.color)); + this.planeModel.setAttributes(attrs); positions = computePlaneShape(dc, this.shadowScale * this.width, this.shadowScale * this.length); - this.shadowModel = new Polyline(positions, this.position.getElevation()); - this.shadowModel.setPathType(Polyline.LINEAR); - this.shadowModel.setFollowTerrain(true); - this.shadowModel.setColor(this.shadowColor); + this.shadowModel = new Path(positions, this.position.getElevation()); + this.shadowModel.setPathType(AVKey.LINEAR); + this.shadowModel.setSurfacePath(true); + attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(this.shadowColor)); + this.shadowModel.setAttributes(attrs); } - private void clearRenderables() - { + private void clearRenderables() { this.planeModel = null; this.shadowModel = null; } - private ArrayList computePlaneShape(DrawContext dc, double width, double length) - { - ArrayList positions = new ArrayList(); + private ArrayList computePlaneShape(DrawContext dc, double width, double length) { + ArrayList positions = new ArrayList<>(); LatLon center = this.position; double hl = length / 2; double hw = width / 2; @@ -190,7 +203,7 @@ private ArrayList computePlaneShape(DrawContext dc, double width, double return positions; } -/* + /* private void renderPlane(DrawContext dc) { GL gl = dc.getGL(); @@ -199,7 +212,7 @@ private void renderPlane(DrawContext dc) gl.glMatrixMode(GL.GL_MODELVIEW); gl.glPushMatrix(); - gl.glDisable(javax.media.opengl.GL.GL_TEXTURE_2D); + gl.glDisable(com.jogamp.opengl.GL.GL_TEXTURE_2D); gl.glColor3d(this.color.getRed() / 255d, this.color.getGreen() / 255d, this.color.getBlue() / 255d); // Placement and orientation @@ -224,5 +237,5 @@ private void renderPlane(DrawContext dc) gl.glPopAttrib(); } -*/ + */ } diff --git a/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java b/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java index 4355bd8ce4..a698fb418e 100644 --- a/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java +++ b/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.render; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; /** diff --git a/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java b/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java index 6374e37eb0..5455ebed9f 100644 --- a/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java +++ b/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.render; @@ -11,7 +33,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwindx.applications.sar.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; /** diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlane.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlane.java index 795f7d22fe..f5ef989b9a 100644 --- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlane.java +++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlane.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.segmentplane; diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java index a01a9f8648..4c5deaa252 100644 --- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java +++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.segmentplane; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.util.*; diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneController.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneController.java index 1c72aff71c..829745564f 100644 --- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneController.java +++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.segmentplane; @@ -215,7 +237,7 @@ public void mouseDragged(MouseEvent e) { if (this.active) { - // Don't update the segment plane here because the World Window current cursor position will not have + // Don't update the segment plane here because the WorldWindow current cursor position will not have // been updated to reflect the current mouse position. Wait to update in the position listener, but // consume the event so the View doesn't respond to it. e.consume(); diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneEditor.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneEditor.java index 351c8301df..a714e45fa2 100644 --- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneEditor.java +++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneEditor.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.segmentplane; diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java index 5d4cb42675..9444f7228d 100644 --- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java +++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.segmentplane; @@ -17,7 +39,7 @@ import gov.nasa.worldwind.terrain.SectorGeometryList; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.*; import java.nio.*; import java.util.*; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/AbstractTrackReader.java b/src/gov/nasa/worldwindx/applications/sar/tracks/AbstractTrackReader.java index b88818d70d..c7b1ddc62c 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/AbstractTrackReader.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/AbstractTrackReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/CSVTrackReader.java b/src/gov/nasa/worldwindx/applications/sar/tracks/CSVTrackReader.java index f310eea1be..83eae8ab46 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/CSVTrackReader.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/CSVTrackReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/CompoundFilter.java b/src/gov/nasa/worldwindx/applications/sar/tracks/CompoundFilter.java index 7768bb996b..eea4a0e98b 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/CompoundFilter.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/CompoundFilter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/GPXTrackReader.java b/src/gov/nasa/worldwindx/applications/sar/tracks/GPXTrackReader.java index 398ba9a3c8..cc32ebcefc 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/GPXTrackReader.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/GPXTrackReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/NMEATrackReader.java b/src/gov/nasa/worldwindx/applications/sar/tracks/NMEATrackReader.java index 5efcdfd59e..fce17b5e18 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/NMEATrackReader.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/NMEATrackReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/SaveTrackFilter.java b/src/gov/nasa/worldwindx/applications/sar/tracks/SaveTrackFilter.java index 36eda1dc3b..e09b769ca6 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/SaveTrackFilter.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/SaveTrackFilter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReader.java b/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReader.java index 42b5c81097..2372f4de1a 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReader.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReaderFilter.java b/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReaderFilter.java index 2f012c5d8b..d88467abe4 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReaderFilter.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/TrackReaderFilter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/tracks/TrackWriter.java b/src/gov/nasa/worldwindx/applications/sar/tracks/TrackWriter.java index 4196dfa8d4..eda2cae1ec 100644 --- a/src/gov/nasa/worldwindx/applications/sar/tracks/TrackWriter.java +++ b/src/gov/nasa/worldwindx/applications/sar/tracks/TrackWriter.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.sar.tracks; diff --git a/src/gov/nasa/worldwindx/applications/sar/worldwind-nosa-1.3.html b/src/gov/nasa/worldwindx/applications/sar/worldwind-nosa-1.3.html deleted file mode 100644 index 4d75a7fc15..0000000000 --- a/src/gov/nasa/worldwindx/applications/sar/worldwind-nosa-1.3.html +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - NASA World Wind License - - - - -
            Default Attributes
            AttributeDefault Value
            unresolvedtrue
            drawInteriortrue
            drawOutlinetrue
            enableAntialiasingtrue
            enableLightingfalse
            interiorMaterial{@link gov.nasa.worldwind.render.Material#WHITE}
            - - - - - -

            NASA WORLD WIND

            - -

            Copyright � 2004-2005 United States Government as represented by the Administrator of the National - Aeronautics and Space Administration. All Rights Reserved.
            Copyright � 2004-2005 Contributors. All Rights - Reserved. -

            - -

             

            - -

            - -

            NASA OPEN SOURCE AGREEMENT VERSION 1.3

            - -

            THIS OPEN SOURCE AGREEMENT ("AGREEMENT") DEFINES THE RIGHTS OF USE, REPRODUCTION, DISTRIBUTION, - MODIFICATION AND REDISTRIBUTION OF CERTAIN COMPUTER SOFTWARE ORIGINALLY RELEASED BY THE UNITED STATES GOVERNMENT AS - REPRESENTED BY THE GOVERNMENT AGENCY LISTED BELOW ("GOVERNMENT AGENCY"). THE UNITED STATES GOVERNMENT, AS - REPRESENTED BY GOVERNMENT AGENCY, IS AN INTENDED THIRD-PARTY BENEFICIARY OF ALL SUBSEQUENT DISTRIBUTIONS OR - REDISTRIBUTIONS OF THE SUBJECT SOFTWARE. ANYONE WHO USES, REPRODUCES, DISTRIBUTES, MODIFIES OR REDISTRIBUTES THE - SUBJECT SOFTWARE, AS DEFINED HEREIN, OR ANY PART THEREOF, IS, BY THAT ACTION, ACCEPTING IN FULL THE RESPONSIBILITIES - AND OBLIGATIONS CONTAINED IN THIS AGREEMENT.

            - -

            Government Agency: National Aeronautics and Space Administration (NASA)
            Government Agency Original - Software Designation: ARC-15166-1
            Government Agency Original Software Title: WorldWind Version 1.3
            User - Registration Requested. Please Visit http://opensource.arc.nasa.gov/
            Government Agency Point of Contact - for Original Software: Patrick.Hogan@nasa.gov

            - -

             

            - -

            1. DEFINITIONS

            - -

            A. "Contributor" means Government Agency, as the developer of the Original Software, - and any entity that makes a Modification.
            B. "Covered Patents" mean patent claims licensable by - a Contributor that are necessarily infringed by the use or sale of its Modification alone or when combined with the - Subject Software.
            C. "Display" means the showing of a copy of the Subject Software, either - directly or by means of an image, or any other device.
            D. "Distribution" means conveyance or - transfer of the Subject Software, regardless of means, to another.
            E. "Larger Work" means - computer software that combines Subject Software, or portions thereof, with software separate from the Subject - Software that is not governed by the terms of this Agreement.
            F. "Modification" means any - alteration of, including addition to or deletion from, the substance or structure of either the Original Software or - Subject Software, and includes derivative works, as that term is defined in the Copyright Statute, 17 USC 101. - However, the act of including Subject Software as part of a Larger Work does not in and of itself constitute a - Modification.
            G. "Original Software" means the computer software first released under this - Agreement by Government Agency with Government Agency designation ARC-15166-1 and entitled WorldWind, including - source code, object code and accompanying documentation, if any.
            H. "Recipient" means anyone - who acquires the Subject Software under this Agreement, including all Contributors.
            I. - "Redistribution" means Distribution of the Subject Software after a Modification has been made.
            - J. "Reproduction" means the making of a counterpart, image or copy of the Subject Software.
            - K. "Sale" means the exchange of the Subject Software for money or equivalent value.
            L. - "Subject Software" means the Original Software, Modifications, or any respective parts thereof.
            - M. "Use" means the application or employment of the Subject Software for any purpose.

            - -

             

            - -

            2. GRANT OF RIGHTS

            - -

            A. Under Non-Patent Rights: -Subject to the terms and conditions of this Agreement, each -Contributor, with respect to its own contribution to the Subject -Software, hereby grants to each Recipient a non-exclusive, world-wide, -royalty-free license to engage in the following activities pertaining -to the Subject Software:

            - -

            1. Use
            2. Distribution
            3. Reproduction
            - 4. Modification
            5. Redistribution
            6. Display

            - -

            B. Under Patent Rights: -Subject to the terms and conditions of this Agreement, each -Contributor, with respect to its own contribution to the Subject -Software, hereby grants to each Recipient under Covered Patents a -non-exclusive, world-wide, royalty-free license to engage in the -following activities pertaining to the Subject Software:

            - -

            1. Use
            2. Distribution
            3. Reproduction
            - 4. Sale
            5. Offer for Sale

            - -

            C. The rights granted under Paragraph B. also apply to the combination of a - Contributor’s Modification and the Subject Software if, at the time the Modification is added by the - Contributor, the addition of such Modification causes the combination to be covered by the Covered Patents. It does - not apply to any other combinations that include a Modification.

            - -

            D. The rights granted in Paragraphs A. and B. allow the Recipient to sublicense those - same rights. Such sublicense must be under the same terms and conditions of this Agreement.

            - -

             

            - -

            3. OBLIGATIONS OF RECIPIENT

            - -

            A. Distribution or Redistribution of the Subject Software must be made under this - Agreement except for additions covered under paragraph 3H.

            - -

            1. Whenever a Recipient distributes or redistributes the Subject Software, a copy of - this Agreement must be included with each copy of the Subject Software; and
            2. If Recipient - distributes or redistributes the Subject Software in any form other than source code, Recipient must also make the - source code freely available, and must provide with each copy of the Subject Software information on how to obtain - the source code in a reasonable manner on or through a medium customarily used for software exchange.

            - -

            B. Each Recipient must ensure that the following copyright notice appears prominently - in the Subject Software:
            Copyright (C) 2001 United States Government
            as represented by the Administrator of - the
            National Aeronautics and Space Administration.
            All Rights Reserved.

            - -

            C. Each Contributor must characterize its alteration of the Subject Software as a - Modification and must identify itself as the originator of its Modification in a manner that reasonably allows - subsequent Recipients to identify the originator of the Modification. In fulfillment of these requirements, - Contributor must include a file (e.g., a change log file) that describes the alterations made and the date of the - alterations, identifies Contributor as originator of the alterations, and consents to characterization of the - alterations as a Modification, for example, by including a statement that the Modification is derived, directly or - indirectly, from Original Software provided by Government Agency. Once consent is granted, it may not thereafter be - revoked.

            - -

            D. A Contributor may add its own copyright notice to the Subject Software. Once a - copyright notice has been added to the Subject Software, a Recipient may not remove it without the express - permission of the Contributor who added the notice.

            - -

            E. A Recipient may not make any representation in the Subject Software or in any - promotional, advertising or other material that may be construed as an endorsement by Government Agency or by any - prior Recipient of any product or service provided by Recipient, or that may seek to obtain commercial advantage by - the fact of Government Agency's or a prior Recipient’s participation in this Agreement.

            - -

            F. In an effort to track usage and maintain accurate records of the Subject Software, - each Recipient, upon receipt of the Subject Software, is requested to register with Government Agency by visiting - the following website: http://opensource.arc.nasa.gov. Recipient’s - name and personal information shall be used for statistical purposes only. Once a Recipient makes a Modification - available, it is requested that the Recipient inform Government Agency at the web site provided above how to access - the Modification.

            - -

            G. Each Contributor represents that that its Modification is believed to be - Contributor’s original creation and does not violate any existing agreements, regulations, statutes or rules, - and further that Contributor has sufficient rights to grant the rights conveyed by this Agreement.

            - -

            H. A Recipient may choose to offer, and to charge a fee for, warranty, support, - indemnity and/or liability obligations to one or more other Recipients of the Subject Software. A Recipient may do - so, however, only on its own behalf and not on behalf of Government Agency or any other Recipient. Such a Recipient - must make it absolutely clear that any such warranty, support, indemnity and/or liability obligation is offered by - that Recipient alone. Further, such Recipient agrees to indemnify Government Agency and every other Recipient for - any liability incurred by them as a result of warranty, support, indemnity and/or liability offered by such - Recipient.

            - -

            I. A Recipient may create a Larger Work by combining Subject Software with separate - software not governed by the terms of this agreement and distribute the Larger Work as a single product. In such - case, the Recipient must make sure Subject Software, or portions thereof, included in the Larger Work is subject to - this Agreement.

            - -

            J. Notwithstanding any provisions contained herein, Recipient is hereby put on notice - that export of any goods or technical data from the United States may require some form of export license from the - U.S. Government. Failure to obtain necessary export licenses may result in criminal liability under U.S. laws. - Government Agency neither represents that a license shall not be required nor that, if required, it shall be issued. - Nothing granted herein provides any such export license.

            - -

             

            - -

            4. DISCLAIMER OF WARRANTIES AND LIABILITIES; WAIVER AND INDEMNIFICATION

            - -

            A. No Warranty: THE SUBJECT SOFTWARE IS PROVIDED - "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, - ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE ERROR - FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. THIS AGREEMENT DOES - NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING - DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, - GOVERNMENT AGENCY DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE - ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS."

            - -

            B. Waiver and Indemnity: -RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES -GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR -RECIPIENT. IF RECIPIENT'S USE OF THE SUBJECT SOFTWARE RESULTS IN ANY -LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES ARISING FROM SUCH -USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM, -RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND -HOLD HARMLESS THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND -SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE EXTENT PERMITTED -BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE -IMMEDIATE, UNILATERAL TERMINATION OF THIS AGREEMENT.

            - -

             

            - -

            5. GENERAL TERMS

            - -

            A. Termination: -This Agreement and the rights granted hereunder will terminate -automatically if a Recipient fails to comply with these terms and -conditions, and fails to cure such noncompliance within thirty (30) -days of becoming aware of such noncompliance. Upon termination, a -Recipient agrees to immediately cease use and distribution of the -Subject Software. All sublicenses to the Subject Software properly -granted by the breaching Recipient shall survive any such termination -of this Agreement.

            - -

            B. Severability: -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement.

            - -

            C. Applicable Law: -This Agreement shall be subject to United States federal law only for -all purposes, including, but not limited to, determining the validity -of this Agreement, the meaning of its provisions and the rights, -obligations and remedies of the parties.

            - -

            D. Entire Understanding: -This Agreement constitutes the entire understanding and agreement of -the parties relating to release of the Subject Software and may not be -superseded, modified or amended except by further written agreement -duly executed by the parties.

            - -

            E. Binding Authority: -By accepting and using the Subject Software under this Agreement, a -Recipient affirms its authority to bind the Recipient to all terms and -conditions of this Agreement and that that Recipient hereby agrees to -all terms and conditions herein.

            - -

            F. Point of Contact: -Any Recipient contact with Government Agency is to be directed to the -designated representative as follows: Patrick.Hogan@nasa.gov

            - - \ No newline at end of file diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/WorldWindow.java b/src/gov/nasa/worldwindx/applications/worldwindow/WorldWindow.java index 16ed3cca55..7874c38e59 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/WorldWindow.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/WorldWindow.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow; @@ -29,7 +51,7 @@ public class WorldWindow System.setProperty("com.apple.mrj.application.growbox.intrudes", "false"); String s = Configuration.getStringValue(Constants.APPLICATION_DISPLAY_NAME); if (s == null) - s = "World Window"; + s = "WorldWindow"; System.setProperty("com.apple.mrj.application.apple.menu.about.name", s); } else if (Configuration.isWindowsOS()) diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/config/AppConfiguration.xml b/src/gov/nasa/worldwindx/applications/worldwindow/config/AppConfiguration.xml index 516d6d7328..965156a08f 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/config/AppConfiguration.xml +++ b/src/gov/nasa/worldwindx/applications/worldwindow/config/AppConfiguration.xml @@ -1,14 +1,36 @@ - + @@ -30,15 +52,18 @@ - + + - + + + \ No newline at end of file diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/config/InitialLayerConfiguration.xml b/src/gov/nasa/worldwindx/applications/worldwindow/config/InitialLayerConfiguration.xml index 76738cd576..dab8a357d3 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/config/InitialLayerConfiguration.xml +++ b/src/gov/nasa/worldwindx/applications/worldwindow/config/InitialLayerConfiguration.xml @@ -1,8 +1,30 @@ diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/config/worldwindow.worldwind.xml b/src/gov/nasa/worldwindx/applications/worldwindow/config/worldwindow.worldwind.xml index 86e8705c32..fe5ec166d2 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/config/worldwindow.worldwind.xml +++ b/src/gov/nasa/worldwindx/applications/worldwindow/config/worldwindow.worldwind.xml @@ -1,14 +1,36 @@ - + \ No newline at end of file diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/AbstractMenu.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/AbstractMenu.java index 5de9335b37..a45bc32ea0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/AbstractMenu.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/AbstractMenu.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppConfiguration.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppConfiguration.java index ab69fb75af..b5df64ef7e 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppConfiguration.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppConfiguration.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrame.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrame.java index d28969c163..11d89eba40 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrame.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrame.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrameImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrameImpl.java index ab5fd3d19c..3dcf66b227 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrameImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppFrameImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanel.java index 784dbf3303..7997f094b8 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanelImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanelImpl.java index f2249f2b36..3d3816f682 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanelImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/AppPanelImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/Constants.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/Constants.java index a7be1d660a..99270c4efc 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/Constants.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/Constants.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/Controller.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/Controller.java index 20ddd2e2fb..1013592104 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/Controller.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/Controller.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; @@ -31,7 +53,7 @@ public class Controller { static { - // The following is required to use Swing menus with the heavyweight canvas used by World Wind. + // The following is required to use Swing menus with the heavyweight canvas used by WorldWind. ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false); JPopupMenu.setDefaultLightWeightPopupEnabled(false); } @@ -257,6 +279,7 @@ public Object getRegisteredObject(String objectID) } catch (Exception e) { + e.printStackTrace(); return null; } } diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/ExternalLinkController.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/ExternalLinkController.java index d20eccd04f..bb3851e3e4 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/ExternalLinkController.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/ExternalLinkController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/IconController.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/IconController.java index 83aa6a0f05..6b0c86b2a9 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/IconController.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/IconController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/ImageLibrary.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/ImageLibrary.java index 4e049feb42..d718a05a11 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/ImageLibrary.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/ImageLibrary.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/InfoPanelController.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/InfoPanelController.java index def0fa4429..0c6cd4683e 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/InfoPanelController.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/InfoPanelController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/Initializable.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/Initializable.java index a31d9d252b..9ca3996347 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/Initializable.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/Initializable.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/Menu.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/Menu.java index 28582fc253..c27afe3fbd 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/Menu.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/Menu.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBar.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBar.java index 468ea90300..d100d95835 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBar.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBar.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBarImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBarImpl.java index 8c9871f44b..79aae3ab73 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBarImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/MenuBarImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/Registry.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/Registry.java index 77b7baf96d..9d1414e8fa 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/Registry.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/Registry.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; @@ -41,7 +63,7 @@ public Object createObject(String className) try { - return Class.forName(className.trim()).newInstance(); + return Class.forName(className.trim()).getConstructor().newInstance(); } catch (Exception e) { diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java index 15629a8081..b99c59f59a 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.applications.worldwindow.core; import gov.nasa.worldwind.layers.*; @@ -11,7 +32,7 @@ import gov.nasa.worldwind.ogc.kml.impl.KMLController; import gov.nasa.worldwind.util.*; import gov.nasa.worldwindx.applications.worldwindow.core.layermanager.*; -import gov.nasa.worldwindx.examples.util.ShapefileLoader; +import gov.nasa.worldwind.formats.shapefile.ShapefileLayerFactory; import javax.swing.*; import javax.xml.stream.XMLStreamException; @@ -23,8 +44,8 @@ * @author tag * @version $Id: SimpleImporter.java 1171 2013-02-11 21:45:02Z dcollins $ */ -public class SimpleImporter -{ +public class SimpleImporter { + protected static final String DEFAULT_GROUP = "Recently Opened"; protected static final AtomicInteger nextLayerNumber = new AtomicInteger(0); @@ -32,90 +53,78 @@ public class SimpleImporter protected Object source; protected Controller controller; - public SimpleImporter(Object source, Controller controller) - { + public SimpleImporter(Object source, Controller controller) { this.source = source; this.controller = controller; } - protected LayerPath getDefaultPathToParent() - { + protected LayerPath getDefaultPathToParent() { return new LayerPath(DEFAULT_GROUP); } - protected void addLayer(final Layer layer, final LayerPath pathToParent) - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - LayerPath path = new LayerPath(pathToParent != null ? pathToParent : getDefaultPathToParent(), + protected void addLayer(final Layer layer, final LayerPath pathToParent) { + SwingUtilities.invokeLater(() -> { + LayerPath path = new LayerPath(pathToParent != null ? pathToParent : getDefaultPathToParent(), layer.getName()); - doAddLayer(layer, path); - } + doAddLayer(layer, path); }); } - protected void doAddLayer(final Layer layer, final LayerPath path) - { + protected void doAddLayer(final Layer layer, final LayerPath path) { LayerManager layerManager = controller.getLayerManager(); layerManager.addLayer(layer, path.lastButOne()); layerManager.selectLayer(layer, true); layerManager.expandPath(path.lastButOne()); } - public String formName(Object source, String defaultName) - { - if (source instanceof File) + public String formName(Object source, String defaultName) { + if (source instanceof File) { return ((File) source).getName(); + } - if (source instanceof URL) + if (source instanceof URL) { return ((URL) source).getPath(); + } - if (source instanceof URI) + if (source instanceof URI) { return ((URI) source).getPath(); + } - if (source instanceof String && WWIO.makeURL((String) source) != null) + if (source instanceof String && WWIO.makeURL((String) source) != null) { return WWIO.makeURL((String) source).getPath(); + } return (defaultName != null ? defaultName : "Layer ") + nextLayerNumber.addAndGet(1); } - public void startImport() - { - if (this.source == null) - { + public void startImport() { + if (this.source == null) { String message = Logging.getMessage("nullValue.SourceIsNull"); // TODO: show error dialog for all errors throw new IllegalStateException(message); } - if (this.isKML(this.source)) + if (this.isKML(this.source)) { this.openKML(this.source); - else if (this.isShapfile(this.source)) + } else if (this.isShapfile(this.source)) { this.openShapefile(this.source); - else - { + } else { String message = Logging.getMessage("generic.UnrecognizedSourceType", source.toString()); throw new IllegalArgumentException(message); } } - protected boolean isKML(Object source) - { + protected boolean isKML(Object source) { return source != null && (source.toString().endsWith(".kml") || source.toString().endsWith(".kmz")); } - protected void openKML(Object source) - { + protected void openKML(Object source) { KMLController kmlController; - try - { + try { KMLRoot kmlRoot = KMLRoot.create(source); - if (kmlRoot == null) - { + if (kmlRoot == null) { String message = Logging.getMessage("generic.UnrecognizedSourceType", source.toString(), - source.toString()); + source.toString()); throw new IllegalArgumentException(message); } @@ -125,29 +134,19 @@ protected void openKML(Object source) layer.addRenderable(kmlController); layer.setName(formName(source, null)); this.addLayer(layer, null); - } - catch (IOException e) - { - e.printStackTrace(); - } - catch (XMLStreamException e) - { + } catch (IOException | XMLStreamException e) { e.printStackTrace(); } } - protected boolean isShapfile(Object source) - { + protected boolean isShapfile(Object source) { return source != null && source.toString().endsWith(".shp"); } - protected void openShapefile(Object source) - { - ShapefileLoader loader = new ShapefileLoader(); - - Layer layer = loader.createLayerFromSource(source); - if (layer != null) - { + protected void openShapefile(Object source) { + var factory = new ShapefileLayerFactory(); + Layer layer = (Layer) factory.createFromShapefileSource(source); + if (layer != null) { layer.setName(formName(source, null)); this.addLayer(layer, null); } diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/StatusPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/StatusPanel.java index eedd204a3e..e4e2cf456c 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/StatusPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/StatusPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBar.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBar.java index c53999723a..8e79985392 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBar.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBar.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBarImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBarImpl.java index 195dd4f885..4fe0bfc83d 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBarImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolBarImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipAnnotation.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipAnnotation.java index 29f579e945..53e831a7c2 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipAnnotation.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipAnnotation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipController.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipController.java index fa6c98db5d..e2adc0d96a 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipController.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/ToolTipController.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/Version.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/Version.java index 33202da1bf..14521ade28 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/Version.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/Version.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; @@ -16,7 +38,7 @@ public class Version private static final String MINOR_VALUE = "0"; private static final String DOT_VALUE = "1"; private static final String VERSION_NUMBER = MAJOR_VALUE + "." + MINOR_VALUE + "." + DOT_VALUE; - private static final String VERSION_NAME = "World Window Alpha"; + private static final String VERSION_NAME = "WorldWindow Alpha"; private static final String RELEASE_DATE = "4 April 2010"; public static String getVersion() diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/WMSLayerInfo.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/WMSLayerInfo.java index e43a535ee2..47871b4faa 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/WMSLayerInfo.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/WMSLayerInfo.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWMenu.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWMenu.java index 5c683f2459..fa2e8e0e1a 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWMenu.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWMenu.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWODialog.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWODialog.java index d0f05c1bc1..8ffee644a4 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWODialog.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWODialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWOPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWOPanel.java index 3f8afd6036..27799906d7 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWOPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWOPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanel.java index 35a9d9a612..41240827a0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanelImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanelImpl.java index 0190f765f0..1e75c608d1 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanelImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/WWPanelImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core; @@ -29,7 +51,7 @@ public class WWPanelImpl extends AbstractFeature implements WWPanel public WWPanelImpl(Registry registry) { - super("World Wind Panel", Constants.WW_PANEL, registry); + super("WorldWind Panel", Constants.WW_PANEL, registry); this.panel = new JPanel(new BorderLayout()); this.wwd = new WorldWindowGLCanvas(); diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/ActiveLayersManager.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/ActiveLayersManager.java index 51c3a037dc..67da2d4dfe 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/ActiveLayersManager.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/ActiveLayersManager.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core.layermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerManager.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerManager.java index 75036043ac..c880c47fb8 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerManager.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerManager.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core.layermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerPath.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerPath.java index 855c0b3318..ec23dda592 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerPath.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/layermanager/LayerPath.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.core.layermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractApplicationFeature.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractApplicationFeature.java index 53381b7738..83f2b9e79f 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractApplicationFeature.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractApplicationFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractElevationsFeature.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractElevationsFeature.java index 681e6e8680..00bf6923bb 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractElevationsFeature.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractElevationsFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeature.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeature.java index f4767fe220..fbfe7c9374 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeature.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureDialog.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureDialog.java index 0ba0ce3e73..357fcd9841 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureDialog.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureDialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureLayer.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureLayer.java index 164a0f9496..e350f886aa 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureLayer.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeatureLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeaturePanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeaturePanel.java index 8ac3e3cb1c..1c03f9bbaf 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeaturePanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractFeaturePanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOnDemandLayerFeature.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOnDemandLayerFeature.java index 86c71cd0bd..ae23581ec0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOnDemandLayerFeature.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOnDemandLayerFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOpenResourceFeature.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOpenResourceFeature.java index ef1bdb7c1d..0253654173 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOpenResourceFeature.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/AbstractOpenResourceFeature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/Compass.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/Compass.java index ecb3740007..d902524480 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/Compass.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/Compass.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/CoordinatesDisplay.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/CoordinatesDisplay.java index 78fe4daae8..873202e762 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/CoordinatesDisplay.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/CoordinatesDisplay.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/Crosshair.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/Crosshair.java index 13e5eaa4ec..b5f5bb4320 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/Crosshair.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/Crosshair.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/DataImportUtil.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/DataImportUtil.java index 2beccd8c82..1a0270279f 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/DataImportUtil.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/DataImportUtil.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; @@ -82,14 +104,14 @@ public static boolean isDataRaster(Object source, AVList params) } /** - * Returns true if the specified input source is non-null and represents a reference to a World Wind .NET LayerSet + * Returns true if the specified input source is non-null and represents a reference to a WorldWind .NET LayerSet * XML document, and false otherwise. The input source may be one of the following:

            • {@link String}
            • *
            • {@link java.io.File}
            • {@link java.net.URL}
            • {@link java.net.URI}
            • {@link * java.io.InputStream}
            * - * @param source the input source reference to test as a World Wind .NET LayerSet document. + * @param source the input source reference to test as a WorldWind .NET LayerSet document. * - * @return true if the input source is a World Wind .NET LayerSet document, and false otherwise. + * @return true if the input source is a WorldWind .NET LayerSet document, and false otherwise. * * @throws IllegalArgumentException if the input source is null. */ @@ -138,7 +160,7 @@ public static boolean isWWDotNetLayerSet(Object source) * default location for importing data. This attempts to use the first FileStore location marked as an "install" * location. If no install location exists, this falls back to the FileStore's default write location, the same * location where downloaded data is cached. - *

            + *

            * The returned {@link java.io.File} represents an abstract path, and therefore may not exist. In this case, the * caller must create the missing directories composing the abstract path. * diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/Feature.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/Feature.java index fe1d1524fe..53420ffa8f 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/Feature.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/Feature.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/FeaturePanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/FeaturePanel.java index fb25a11f93..3945b63d46 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/FeaturePanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/FeaturePanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/FileMenu.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/FileMenu.java index 4b90645ed5..31f538d111 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/FileMenu.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/FileMenu.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/GazetteerPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/GazetteerPanel.java index feca85814c..a376342013 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/GazetteerPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/GazetteerPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/Graticule.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/Graticule.java index 3a233cc2da..2ba98d7917 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/Graticule.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/Graticule.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/GraticuleLayer.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/GraticuleLayer.java index 19282319f0..9875d7eab6 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/GraticuleLayer.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/GraticuleLayer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataDialog.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataDialog.java index 84f8da0359..041986ba17 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataDialog.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataDialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; @@ -120,7 +142,7 @@ public void run() try { - // Import the file into a form usable by World Wind components. + // Import the file into a form usable by WorldWind components. dataConfig = importDataFromFile(ImportedDataDialog.this.dialog, file, fileStore); } catch (Exception e) @@ -226,9 +248,9 @@ protected static void loadImportedDataFromDirectory(File dir, ImportedDataPanel continue; // This data configuration came from an existing file from disk, therefore we cannot guarantee that the - // current version of World Wind's data importers produced it. This data configuration file may have been - // created by a previous version of World Wind, or by another program. Set fallback values for any missing - // parameters that World Wind needs to construct a Layer or ElevationModel from this data configuration. + // current version of WorldWind's data importers produced it. This data configuration file may have been + // created by a previous version of WorldWind, or by another program. Set fallback values for any missing + // parameters that WorldWind needs to construct a Layer or ElevationModel from this data configuration. AVList params = new AVListImpl(); setFallbackParams(doc, filename, params); @@ -378,7 +400,7 @@ protected static Document createDataStoreFromFile(File file, FileStore fileStore try { - // Convert the file to a form usable by World Wind components, according to the specified DataStoreProducer. + // Convert the file to a form usable by WorldWind components, according to the specified DataStoreProducer. // This throws an exception if production fails for any reason. producer.startProduction(); } diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataPanel.java index f935994de2..6a867bd909 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/ImportedDataPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; @@ -24,10 +46,10 @@ import java.awt.event.*; /** - * Displays UI components for a set of caller specified imported data, and manages creation of World Wind components + * Displays UI components for a set of caller specified imported data, and manages creation of WorldWind components * from that data. Callers fill the panel with imported data by invoking {@link #addImportedData(org.w3c.dom.Element, * gov.nasa.worldwind.avlist.AVList)}. This adds the UI components for a specified data set (a "Go To" button, and a - * label description), creates a World Wind component from the DataConfiguration, and adds the component to the World + * label description), creates a WorldWind component from the DataConfiguration, and adds the component to the World * Window passed to the panel during construction. * * @author dcollins @@ -64,10 +86,10 @@ public ImportedDataPanel(String title, Controller controller) } /** - * Adds the UI components for the specified imported data to this panel, and adds the World Wind component created + * Adds the UI components for the specified imported data to this panel, and adds the WorldWind component created * from the data to the WorldWindow passed to this panel during construction. * - * @param domElement the document which describes a World Wind data configuration. + * @param domElement the document which describes a WorldWind data configuration. * @param params the parameter list which overrides or extends information contained in the document. * * @throws IllegalArgumentException if the Element is null. diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/LatLonGraticule.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/LatLonGraticule.java index dc970c8884..a9f11a847e 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/LatLonGraticule.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/LatLonGraticule.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/Measurement.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/Measurement.java index a37c96deb2..31f7369f4d 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/Measurement.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/Measurement.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementDialog.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementDialog.java index 70519de633..e0ad01f73a 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementDialog.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementDialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java index e60f23a572..f5c92840d2 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.applications.worldwindow.features; import gov.nasa.worldwind.Disposable; @@ -14,6 +35,7 @@ import gov.nasa.worldwindx.applications.worldwindow.util.*; import gov.nasa.worldwindx.applications.worldwindow.util.measuretool.WWOMeasureTool; +import java.util.ArrayList; import javax.swing.*; import javax.swing.border.*; import java.awt.*; @@ -25,8 +47,8 @@ * @version $Id: MeasurementPanel.java 1171 2013-02-11 21:45:02Z dcollins $ */ @SuppressWarnings("unchecked") -public class MeasurementPanel extends AbstractFeaturePanel -{ +public class MeasurementPanel extends AbstractFeaturePanel { + private static final String NAME = "Measurement"; private WWOMeasureTool measureTool; @@ -44,13 +66,12 @@ public class MeasurementPanel extends AbstractFeaturePanel private Color fillColor = Color.WHITE; private String pathType = AVKey.GREAT_CIRCLE; - public MeasurementPanel(Registry registry) - { + public MeasurementPanel(Registry registry) { super(NAME + " Panel", Constants.FEATURE_MEASUREMENT_PANEL, new ShadedPanel(new BorderLayout()), registry); } - public void initialize(final Controller controller) - { + @Override + public void initialize(final Controller controller) { super.initialize(controller); JPanel np = new JPanel(); @@ -71,73 +92,71 @@ public void initialize(final Controller controller) this.makeToolListener(); } - public void setLayers(RenderableLayer shapeLayer, RenderableLayer controlPointsLayer) - { + public void setLayers(RenderableLayer shapeLayer, RenderableLayer controlPointsLayer) { this.shapeLayer = shapeLayer; this.controlPointsLayer = controlPointsLayer; this.shapeCombo.setSelectedItem(LINE); } - public RenderableLayer getShapeLayer() - { + public RenderableLayer getShapeLayer() { return this.shapeLayer; } - public Renderable getShape() - { + public Renderable getShape() { return this.measureTool != null ? this.measureTool.getShape() : null; } - public JComponent[] getDialogControls() - { + @Override + public JComponent[] getDialogControls() { return null; } - public WWOMeasureTool getMeasureTool() - { + public WWOMeasureTool getMeasureTool() { return this.measureTool; } - public void clearPanel() - { + public void clearPanel() { this.disposeCurrentMeasureTool(); this.shapeCombo.setSelectedItem(LINE); } - public void deletePanel() - { + public void deletePanel() { this.disposeCurrentMeasureTool(); } - public void setLineColor(Color color) - { - if (color == null || this.measureTool == null || this.measureTool.getShape() == null) + public void setLineColor(Color color) { + if (color == null || this.measureTool == null || this.measureTool.getShape() == null) { return; + } this.lineColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), (int) (0.3 * color.getAlpha())); this.setShapeColor(this.measureTool.getShape(), this.lineColor, this.fillColor); } - public void setFillColor(Color color) - { - if (color == null || this.measureTool == null || this.measureTool.getShape() == null) + public void setFillColor(Color color) { + if (color == null || this.measureTool == null || this.measureTool.getShape() == null) { return; + } this.fillColor = color; this.setShapeColor(this.measureTool.getShape(), this.lineColor, this.fillColor); } - public void setShapeColor(Renderable shape, Color lineColor, Color fillColor) - { - if (shape instanceof Polyline) - ((Polyline) shape).setColor(lineColor); + public void setShapeColor(Renderable shape, Color lineColor, Color fillColor) { + if (shape instanceof Path) { + Path path = (Path) shape; + if (path.getAttributes() == null) { + path.setAttributes(new BasicShapeAttributes()); + } + path.getAttributes().setOutlineMaterial(new Material(lineColor)); + } - if (shape instanceof SurfaceShape) - { + if (shape instanceof SurfaceShape) { SurfaceShape sShape = (SurfaceShape) shape; ShapeAttributes attrs = sShape.getAttributes(); - if (attrs == null) + if (attrs == null) { attrs = new BasicShapeAttributes(); + } attrs.setInteriorMaterial(new Material(fillColor)); attrs.setInteriorOpacity(0.3); attrs.setDrawOutline(false); @@ -145,26 +164,27 @@ public void setShapeColor(Renderable shape, Color lineColor, Color fillColor) } } - protected void setPathType(String pathType) - { - if (pathType == null || this.measureTool == null || this.measureTool.getShape() == null) + protected void setPathType(String pathType) { + if (pathType == null || this.measureTool == null || this.measureTool.getShape() == null) { return; + } this.pathType = pathType; - if (this.measureTool.getShape() instanceof Polyline) - ((Polyline) this.measureTool.getShape()).setPathType(pathType); - else if (this.measureTool.getShape() instanceof SurfaceShape) + if (this.measureTool.getShape() instanceof Path) { + ((Path) this.measureTool.getShape()).setPathType(pathType); + } else if (this.measureTool.getShape() instanceof SurfaceShape) { ((SurfaceShape) this.measureTool.getShape()).setPathType(pathType); + } } - protected void installNewMeasureTool(String shapeType) - { + protected void installNewMeasureTool(String shapeType) { Renderable shape = this.makeMeasureShape(shapeType); this.measureTool = new WWOMeasureTool(this.controller.getWWd(), shape, - shapeType.equals(PATH) || shapeType.equals(FREEHAND) ? AVKey.SHAPE_PATH : null, this.controlPointsLayer); - if (shapeType.equals(FREEHAND)) + shapeType.equals(PATH) || shapeType.equals(FREEHAND) ? AVKey.SHAPE_PATH : null, this.controlPointsLayer); + if (shapeType.equals(FREEHAND)) { this.measureTool.setFreeHand(true); + } this.measureTool.setUnitsFormat(this.controller.getUnits()); this.setShapeColor(this.measureTool.getShape(), this.lineColor, this.fillColor); @@ -175,101 +195,101 @@ protected void installNewMeasureTool(String shapeType) this.measureTool.addPropertyChangeListener(this.toolListener); } - protected void disposeCurrentMeasureTool() - { - if (this.measureTool == null) + protected void disposeCurrentMeasureTool() { + if (this.measureTool == null) { return; + } this.shapeLayer.removeRenderable(this.measureTool.getShape()); - if (this.measureTool.getShape() instanceof Disposable) + if (this.measureTool.getShape() instanceof Disposable) { ((Disposable) this.measureTool.getShape()).dispose(); + } this.measureTool.removePropertyChangeListener(this.toolListener); this.measureTool.dispose(); this.measureTool = null; } - private Renderable makeMeasureShape(String shapeType) - { - if (shapeType.equals(LINE) || shapeType.equals(PATH) || shapeType.equals(FREEHAND)) - { - Polyline line = new Polyline(); - line.setFollowTerrain(true); - line.setLineWidth(shapeType.equals(FREEHAND) ? 2 : 4); + private Renderable makeMeasureShape(String shapeType) { + if (shapeType.equals(LINE) || shapeType.equals(PATH) || shapeType.equals(FREEHAND)) { + Path line = new Path(); + line.setPositions(new ArrayList<>()); + line.setSurfacePath(true); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineWidth(shapeType.equals(FREEHAND) ? 2 : 4); + line.setAttributes(attrs); return line; } - if (shapeType.equals(CIRCLE)) + if (shapeType.equals(CIRCLE)) { return new SurfaceCircle(); - if (shapeType.equals(ELLIPSE)) + } + if (shapeType.equals(ELLIPSE)) { return new SurfaceEllipse(); - if (shapeType.equals(SQUARE)) + } + if (shapeType.equals(SQUARE)) { return new SurfaceSquare(); - if (shapeType.equals(RECTANGLE)) + } + if (shapeType.equals(RECTANGLE)) { return new SurfaceQuad(); - if (shapeType.equals(POLYGON)) + } + if (shapeType.equals(POLYGON)) { return new SurfacePolygon(); + } return null; } - private boolean layerContains(RenderableLayer layer, Renderable renderable) - { - for (Renderable r : layer.getRenderables()) - { - if (r == renderable) + private boolean layerContains(RenderableLayer layer, Renderable renderable) { + for (Renderable r : layer.getRenderables()) { + if (r == renderable) { return true; + } } return false; } - protected void makeToolListener() - { - this.toolListener = new PropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent event) - { - // The tool was armed / disarmed - if (event.getPropertyName().equals(WWOMeasureTool.EVENT_ARMED)) - { - if (getMeasureTool().isArmed()) - { - newButton.setEnabled(false); - pauseButton.setText("Pause"); - pauseButton.setEnabled(true); - endButton.setEnabled(true); - controller.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); - ((Component) controller.getWWd()).requestFocus(); - } - else - { - newButton.setEnabled(true); - pauseButton.setText("Pause"); - pauseButton.setEnabled(false); - endButton.setEnabled(false); - controller.setCursor(Cursor.getDefaultCursor()); - } + protected void makeToolListener() { + this.toolListener = (PropertyChangeEvent event) -> { + // The tool was armed / disarmed + if (event.getPropertyName().equals(WWOMeasureTool.EVENT_ARMED)) { + if (getMeasureTool().isArmed()) { + newButton.setEnabled(false); + pauseButton.setText("Pause"); + pauseButton.setEnabled(true); + endButton.setEnabled(true); + controller.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); + ((Component) controller.getWWd()).requestFocus(); + } else { + newButton.setEnabled(true); + pauseButton.setText("Pause"); + pauseButton.setEnabled(false); + endButton.setEnabled(false); + controller.setCursor(Cursor.getDefaultCursor()); } - else if (event.getPropertyName().equals(WWOMeasureTool.EVENT_POSITION_ADD)) - { - if (getMeasureTool().getShape() != null - && !layerContains(getShapeLayer(), getMeasureTool().getShape())) - { - getShapeLayer().addRenderable(getMeasureTool().getShape()); - } - } // TODO: remove shape when it becomes undefined? such as no points in line - } + } else if (event.getPropertyName().equals(WWOMeasureTool.EVENT_POSITION_ADD)) { + if (getMeasureTool().getShape() != null + && !layerContains(getShapeLayer(), getMeasureTool().getShape())) { + getShapeLayer().addRenderable(getMeasureTool().getShape()); + } + } // TODO: remove shape when it becomes undefined? such as no points in line }; } - protected void updatePanelValues() - { - if (this.pathType.equals(AVKey.LINEAR)) - this.pathTypeCombo.setSelectedIndex(0); - else if (this.pathType.equals(AVKey.RHUMB_LINE)) - this.pathTypeCombo.setSelectedIndex(1); - else if (this.pathType.equals(AVKey.GREAT_CIRCLE)) - this.pathTypeCombo.setSelectedIndex(2); + protected void updatePanelValues() { + switch (this.pathType) { + case AVKey.LINEAR: + this.pathTypeCombo.setSelectedIndex(0); + break; + case AVKey.RHUMB_LINE: + this.pathTypeCombo.setSelectedIndex(1); + break; + case AVKey.GREAT_CIRCLE: + this.pathTypeCombo.setSelectedIndex(2); + break; + default: + break; + } } private static final String LINE = "Line"; @@ -284,8 +304,7 @@ else if (this.pathType.equals(AVKey.GREAT_CIRCLE)) private static final String RHUMB = "Rhumb"; private static final String LINEAR = "Linear"; - private void createComponents(JPanel panel) - { + private void createComponents(JPanel panel) { // Shape combo JPanel shapePanel = new JPanel(new GridLayout(1, 2, 5, 5)); shapePanel.setOpaque(false); @@ -293,17 +312,13 @@ private void createComponents(JPanel panel) shapePanel.add(new JLabel("Measurement Type:")); this.shapeCombo = new JComboBox( - new String[] {LINE, PATH, POLYGON, CIRCLE, ELLIPSE, SQUARE, RECTANGLE, FREEHAND}); + new String[]{LINE, PATH, POLYGON, CIRCLE, ELLIPSE, SQUARE, RECTANGLE, FREEHAND}); this.shapeCombo.setToolTipText("Choose a measurement type"); this.shapeCombo.setOpaque(false); - this.shapeCombo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); - disposeCurrentMeasureTool(); - installNewMeasureTool(item); - } + this.shapeCombo.addActionListener((ActionEvent event) -> { + String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); + disposeCurrentMeasureTool(); + installNewMeasureTool(item); }); shapePanel.add(this.shapeCombo); @@ -313,24 +328,27 @@ public void actionPerformed(ActionEvent event) pathTypePanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); pathTypePanel.add(new JLabel("Route type:")); - this.pathTypeCombo = new JComboBox(new String[] {LINEAR, RHUMB, GREAT_CIRCLE}); + this.pathTypeCombo = new JComboBox(new String[]{LINEAR, RHUMB, GREAT_CIRCLE}); this.pathTypeCombo.setToolTipText("Choose a route type"); this.pathTypeCombo.setOpaque(false); this.pathTypeCombo.setSelectedIndex(2); - this.pathTypeCombo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); - if (item.equals(LINEAR)) + this.pathTypeCombo.addActionListener((ActionEvent event) -> { + String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); + switch (item) { + case LINEAR: setPathType(AVKey.LINEAR); - else if (item.equals(RHUMB)) + break; + case RHUMB: setPathType(AVKey.RHUMB_LINE); - else if (item.equals(GREAT_CIRCLE)) + break; + case GREAT_CIRCLE: setPathType(AVKey.GREAT_CIRCLE); - - controller.redraw(); + break; + default: + break; } + + controller.redraw(); }); pathTypePanel.add(this.pathTypeCombo); @@ -343,15 +361,12 @@ else if (item.equals(GREAT_CIRCLE)) this.newButton = new JButton("Start"); this.newButton.setToolTipText("Start creating a measurement"); this.newButton.setOpaque(false); - this.newButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - getMeasureTool().clear(); - if (shapeLayer != null && measureTool.getShape() != null) - shapeLayer.removeRenderable(measureTool.getShape()); - getMeasureTool().setArmed(true); + this.newButton.addActionListener((ActionEvent actionEvent) -> { + getMeasureTool().clear(); + if (shapeLayer != null && measureTool.getShape() != null) { + shapeLayer.removeRenderable(measureTool.getShape()); } + getMeasureTool().setArmed(true); }); buttonPanel.add(this.newButton); this.newButton.setEnabled(true); @@ -359,16 +374,12 @@ public void actionPerformed(ActionEvent actionEvent) this.pauseButton = new JButton("Pause"); this.pauseButton.setToolTipText("Pause temporarily during measurement creation"); this.pauseButton.setOpaque(false); - this.pauseButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - getMeasureTool().setArmed(!getMeasureTool().isArmed()); - pauseButton.setText(!getMeasureTool().isArmed() ? "Resume" : "Pause"); - pauseButton.setEnabled(true); - ((Component) controller.getWWd()).setCursor(!getMeasureTool().isArmed() ? Cursor.getDefaultCursor() + this.pauseButton.addActionListener((ActionEvent actionEvent) -> { + getMeasureTool().setArmed(!getMeasureTool().isArmed()); + pauseButton.setText(!getMeasureTool().isArmed() ? "Resume" : "Pause"); + pauseButton.setEnabled(true); + ((Component) controller.getWWd()).setCursor(!getMeasureTool().isArmed() ? Cursor.getDefaultCursor() : Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); - } }); buttonPanel.add(this.pauseButton); this.pauseButton.setEnabled(false); @@ -376,12 +387,8 @@ public void actionPerformed(ActionEvent actionEvent) this.endButton = new JButton("Finish"); this.endButton.setToolTipText("Press when measurement shape is complete"); this.endButton.setOpaque(false); - this.endButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - getMeasureTool().setArmed(false); - } + this.endButton.addActionListener((ActionEvent actionEvent) -> { + getMeasureTool().setArmed(false); }); buttonPanel.add(endButton); this.endButton.setEnabled(false); diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/Navigation.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/Navigation.java index 5a5cd5ae2d..cdcc948e9b 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/Navigation.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/Navigation.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/NetworkActivitySignal.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/NetworkActivitySignal.java index a8bed816c4..9437841492 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/NetworkActivitySignal.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/NetworkActivitySignal.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenFile.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenFile.java index a1cf809c59..f2b82907e3 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenFile.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenFile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenURL.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenURL.java index aa9c6884c5..c8e6c2361b 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenURL.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/OpenURL.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/ScaleBar.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/ScaleBar.java index 8fc3739aed..3f0449d575 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/ScaleBar.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/ScaleBar.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/StatusPanelImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/StatusPanelImpl.java index c7a86f54ca..fc220c9036 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/StatusPanelImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/StatusPanelImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; @@ -151,7 +173,7 @@ public void actionPerformed(ActionEvent actionEvent) protected Object lastSelectedObject; - // Monitors World Wind select events and if the object selected has a status-bar message attached to it, displays + // Monitors WorldWind select events and if the object selected has a status-bar message attached to it, displays // that message in the status bar. If there is no status-bark message attached to the selected object but there is // an external link attached, displays the external-link string. public void selected(SelectEvent event) diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/UTMGraticule.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/UTMGraticule.java index 5cf0ca40b1..979da1eda9 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/UTMGraticule.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/UTMGraticule.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSDialog.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSDialog.java index ac3c5e9aa6..e7a179161f 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSDialog.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSDialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSPanel.java index 4f9aa05a48..7ebbb592a0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/WMSPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; @@ -220,7 +242,7 @@ protected void createLayer(LayerNode layerNode) WMSLayerInfo wmsInfo = layerNode.getWmsLayerInfo(); AVList configParams = wmsInfo.getParams().copy(); // Copy to insulate changes from the caller. - // Some wms servers are slow, so increase the timeouts and limits used by world wind's retrievers. + // Some wms servers are slow, so increase the timeouts and limits used by WorldWind's retrievers. configParams.setValue(AVKey.URL_CONNECT_TIMEOUT, 30000); configParams.setValue(AVKey.URL_READ_TIMEOUT, 30000); configParams.setValue(AVKey.RETRIEVAL_QUEUE_STALE_REQUEST_LIMIT, 60000); diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/YahooGazetteer.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/YahooGazetteer.java index 199e73df61..399708c31d 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/YahooGazetteer.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/YahooGazetteer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersList.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersList.java index a3651d590b..e2234ad780 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersList.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersList.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersPanel.java index 054384cfaf..fbba086ad4 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ActiveLayersPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; @@ -192,7 +214,7 @@ public void updateLayerList(LayerList layerList) layerList.replaceAll(newList); } - // Handles reordering of the World Wind layer list via this panel. + // Handles reordering of the WorldWind layer list via this panel. protected class ReorderListener extends MouseAdapter { protected JList list; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanel.java index 5c5bcfa630..0fe0d05dfe 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanelImpl.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanelImpl.java index b1e9ce075b..cc26c72e32 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanelImpl.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/ControlsPanelImpl.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerDialog.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerDialog.java index a47460c6b0..629da5eec8 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerDialog.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerDialog.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerPanel.java index e368045cf6..2d659523a0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerManagerPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; @@ -536,7 +558,7 @@ protected void createLayer(LayerNode layerNode) WMSLayerInfo wmsInfo = layerNode.getWmsLayerInfo(); AVList configParams = wmsInfo.getParams().copy(); // Copy to insulate changes from the caller. - // Some wms servers are slow, so increase the timeouts and limits used by world wind's retrievers. + // Some wms servers are slow, so increase the timeouts and limits used by WorldWind's retrievers. configParams.setValue(AVKey.URL_CONNECT_TIMEOUT, 30000); configParams.setValue(AVKey.URL_READ_TIMEOUT, 30000); configParams.setValue(AVKey.RETRIEVAL_QUEUE_STALE_REQUEST_LIMIT, 60000); diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerNode.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerNode.java index a505932708..dadf0cc7b8 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerNode.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerNode.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTree.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTree.java index f48407ecec..abf27aad9c 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTree.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTree.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeGroupNode.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeGroupNode.java index 32e5fc6727..83c6ce07a0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeGroupNode.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeGroupNode.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeModel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeModel.java index de6d6f2d40..5c9f74dec3 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeModel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeModel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; @@ -151,7 +173,7 @@ protected LayerTreeGroupNode makeGroup(LayerList layerList) * aren't already in the tree, and removes layers from the tree if they are labeled internal. It does not remove * other layers in the model but missing from the specified layer list. Use {@link #removeNode(Object)} for that. * - * @param layerList the layerlist to synchronize with, typically the active layer list of the World Window. + * @param layerList the layerlist to synchronize with, typically the active layer list of the WorldWindow. */ public void refresh(LayerList layerList) { diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeNode.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeNode.java index 9ea1c2b421..7fa6e4153f 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeNode.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/swinglayermanager/LayerTreeNode.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.features.swinglayermanager; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/GB.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/GB.java index 53443459ef..282bfc2974 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/GB.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/GB.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/LayerTree.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/LayerTree.java index 7f86348f89..f07a3c326d 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/LayerTree.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/LayerTree.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/PanelTitle.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/PanelTitle.java index 88d8834a2e..844b0d9308 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/PanelTitle.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/PanelTitle.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/ShadedPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/ShadedPanel.java index 8da3339ada..125d3e54ce 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/ShadedPanel.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/ShadedPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/Util.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/Util.java index 851f284397..6d7556e7ae 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/Util.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/Util.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/WMSLayerTree.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/WMSLayerTree.java index dc3eb643cf..7ab54c18bd 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/WMSLayerTree.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/WMSLayerTree.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/WWOUnitsFormat.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/WWOUnitsFormat.java index a7915c6a22..5239c8d5b3 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/WWOUnitsFormat.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/WWOUnitsFormat.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureDisplay.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureDisplay.java index 79a161d9e0..bb15901a9b 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureDisplay.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureDisplay.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util.measuretool; diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureTool.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureTool.java index 437dc382b0..6b438a270a 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureTool.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureTool.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.applications.worldwindow.util.measuretool; import gov.nasa.worldwind.*; @@ -26,10 +47,10 @@ * @version $Id: WWOMeasureTool.java 1171 2013-02-11 21:45:02Z dcollins $ */ public class WWOMeasureTool extends AVListImpl - implements Disposable, MouseListener, MouseMotionListener, SelectListener, PositionListener, RenderingListener -{ - public interface MeasureDisplay - { + implements Disposable, MouseListener, MouseMotionListener, SelectListener, PositionListener, RenderingListener { + + public interface MeasureDisplay { + public void updateMeasureDisplay(Position position); public void addToLayer(RenderableLayer layer); @@ -59,8 +80,8 @@ public interface MeasureDisplay boolean isAnnotation(Object o); } - public interface ControlPoint - { + public interface ControlPoint { + public WWOMeasureTool getParent(); public Object setValue(String key, Object value); @@ -74,8 +95,8 @@ public interface ControlPoint public void highlight(boolean tf); } - public interface ControlPointList - { + public interface ControlPointList { + public int size(); public ControlPoint createControlPoint(Position position); @@ -120,7 +141,7 @@ public interface ControlPointList protected boolean showAnnotation = true; protected UnitsFormat unitsFormat = new UnitsFormat(); - protected ArrayList positions = new ArrayList(); + protected ArrayList positions = new ArrayList<>(); protected Rectangle2D.Double shapeRectangle = null; protected Position shapeCenterPosition = null; protected Angle shapeOrientation = null; @@ -137,17 +158,14 @@ public interface ControlPointList protected WWOMeasureTool.ControlPoint movingTarget; protected WWOMeasureTool.ControlPoint lastPickedObject; - public WWOMeasureTool(final WorldWindow wwd, Renderable shape, String lineType, RenderableLayer controlPointsLayer) - { - if (wwd == null) - { + public WWOMeasureTool(final WorldWindow wwd, Renderable shape, String lineType, RenderableLayer controlPointsLayer) { + if (wwd == null) { String msg = Logging.getMessage("nullValue.WorldWindow"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (shape == null) - { + if (shape == null) { String msg = Logging.getMessage("nullValue.Shape"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -169,14 +187,14 @@ public WWOMeasureTool(final WorldWindow wwd, Renderable shape, String lineType, this.getWwd().addRenderingListener(this); this.shape = shape; - if (this.shape instanceof Polyline) - this.setMeasureShape((Polyline) this.shape, lineType); - else + if (this.shape instanceof Path) { + this.setMeasureShape((Path) this.shape, lineType); + } else { this.setMeasureShape((SurfaceShape) this.shape); + } } - public void dispose() - { + public void dispose() { this.getWwd().getInputHandler().removeMouseListener(this); this.getWwd().getInputHandler().removeMouseMotionListener(this); this.getWwd().removePositionListener(this); @@ -188,25 +206,20 @@ public void dispose() this.getControlPoints().clear(); } - protected ControlPointList createControlPoints() - { + protected ControlPointList createControlPoints() { return new WWOMeasureToolControlPoints(this); } - protected MeasureDisplay createMeasureDisplay() - { + protected MeasureDisplay createMeasureDisplay() { return new WWOMeasureDisplay(this); } - public WorldWindow getWwd() - { + public WorldWindow getWwd() { return this.wwd; } - public void setUnitsFormat(UnitsFormat unitsFormat) - { - if (unitsFormat == null) - { + public void setUnitsFormat(UnitsFormat unitsFormat) { + if (unitsFormat == null) { String msg = Logging.getMessage("nullValue.Format"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -215,82 +228,66 @@ public void setUnitsFormat(UnitsFormat unitsFormat) this.unitsFormat = unitsFormat; } - public UnitsFormat getUnitsFormat() - { + public UnitsFormat getUnitsFormat() { return this.unitsFormat; } - public void setLabel(String labelName, String label) - { + public void setLabel(String labelName, String label) { this.measureDisplay.setLabel(labelName, label); } - public String getLabel(String labelName) - { + public String getLabel(String labelName) { return this.measureDisplay.getLabel(labelName); } - public Renderable getShape() - { + public Renderable getShape() { return this.shape; } - public boolean isShowControlPoints() - { + public boolean isShowControlPoints() { return this.showControlPoints; } - public void setShowControlPoints(boolean state) - { + public void setShowControlPoints(boolean state) { this.showControlPoints = state; this.controlPointsLayer.setEnabled(state); this.getWwd().redraw(); } - public boolean isShowAnnotation() - { + public boolean isShowAnnotation() { return this.showAnnotation; } - public void setShowAnnotation(boolean state) - { + public void setShowAnnotation(boolean state) { this.showAnnotation = state; } - public boolean isUseRubberBand() - { + public boolean isUseRubberBand() { return this.useRubberBand; } - public void setUseRubberBand(boolean state) - { + public void setUseRubberBand(boolean state) { this.useRubberBand = state; } - public boolean isFreeHand() - { + public boolean isFreeHand() { return this.freeHand; } - public void setFreeHand(boolean state) - { + public void setFreeHand(boolean state) { this.freeHand = state; } - public double getFreeHandMinSpacing() - { + public double getFreeHandMinSpacing() { return this.freeHandMinSpacing; } - public void setFreeHandMinSpacing(double distance) - { + public void setFreeHandMinSpacing(double distance) { this.freeHandMinSpacing = distance; } - public void clear() - { - while (this.positions.size() > 0 || this.getControlPoints().size() > 0) - { + public void clear() { + while (this.positions.size() > 0 || this.getControlPoints().size() > 0) { this.removeControlPoint(); } @@ -299,63 +296,51 @@ public void clear() this.shapeRectangle = null; } - public String getMeasureShapeType() - { + public String getMeasureShapeType() { return this.measureShapeType; } - public ArrayList getPositions() - { + public ArrayList getPositions() { return this.positions; } - protected ControlPointList getControlPoints() - { + protected ControlPointList getControlPoints() { return this.controlPoints; } - protected ControlPoint createControlPoint(Position position) - { + protected ControlPoint createControlPoint(Position position) { return this.controlPoints.createControlPoint(position); } - public Rectangle2D.Double getShapeRectangle() - { + public Rectangle2D.Double getShapeRectangle() { return this.shapeRectangle; } - protected void setMeasureShape(Polyline line, String shapeType) - { - if (line == null) - { + protected void setMeasureShape(Path line, String shapeType) { + if (line == null) { String msg = Logging.getMessage("nullValue.Shape"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - this.setArmed(false); - this.clear(); this.shape = line; this.regularShape = false; // Update position list and create control points int i = 0; - for (Position pos : line.getPositions()) - { + for (Position pos : line.getPositions()) { this.positions.add(pos); addControlPoint(pos, "PositionIndex", i++); } // Set proper measure shape type this.measureShapeType = (shapeType != null && shapeType.equals(AVKey.SHAPE_PATH)) - ? AVKey.SHAPE_PATH : AVKey.SHAPE_LINE; + ? AVKey.SHAPE_PATH : AVKey.SHAPE_LINE; this.firePropertyChange(EVENT_POSITION_REPLACE, null, null); this.getWwd().redraw(); } - protected void setMeasureShape(SurfaceShape newShape) - { - if (newShape == null) - { + protected void setMeasureShape(SurfaceShape newShape) { + if (newShape == null) { String msg = Logging.getMessage("nullValue.Shape"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); @@ -364,8 +349,7 @@ protected void setMeasureShape(SurfaceShape newShape) this.setArmed(false); this.clear(); - if (newShape instanceof SurfaceQuad) - { + if (newShape instanceof SurfaceQuad) { this.shape = newShape; this.regularShape = true; this.measureShapeType = newShape instanceof SurfaceSquare ? AVKey.SHAPE_SQUARE : AVKey.SHAPE_QUAD; @@ -378,9 +362,7 @@ protected void setMeasureShape(SurfaceShape newShape) this.updateShapeControlPoints(); // Extract positions from shape this.updatePositionsFromShape(); - } - else if (newShape instanceof SurfaceEllipse) - { + } else if (newShape instanceof SurfaceEllipse) { // Set measure shape type this.shape = newShape; this.regularShape = true; @@ -389,14 +371,13 @@ else if (newShape instanceof SurfaceEllipse) SurfaceEllipse shape = ((SurfaceEllipse) newShape); this.shapeCenterPosition = new Position(shape.getCenter(), 0); this.shapeRectangle = new Rectangle2D.Double(0, 0, shape.getMajorRadius() * 2, - shape.getMinorRadius() * 2); + shape.getMinorRadius() * 2); this.shapeOrientation = shape.getHeading(); // Create control points for regular shapes this.updateShapeControlPoints(); // Extract positions from shape this.updatePositionsFromShape(); - } - else // SurfacePolygon, SurfacePolyline, SurfaceSector, or some custom shape + } else // SurfacePolygon, SurfacePolyline, SurfaceSector, or some custom shape { // Set measure shape type this.shape = newShape; @@ -404,8 +385,7 @@ else if (newShape instanceof SurfaceEllipse) // Extract positions from shape updatePositionsFromShape(); // Create control points for each position except the last that is the same as the first - for (int i = 0; i < this.positions.size() - 1; i++) - { + for (int i = 0; i < this.positions.size() - 1; i++) { addControlPoint(this.positions.get(i), "PositionIndex", i); } } @@ -414,101 +394,85 @@ else if (newShape instanceof SurfaceEllipse) this.getWwd().redraw(); } - protected boolean isRegularShape() - { + protected boolean isRegularShape() { return this.regularShape; } // *** Metric accessors *** - - public double getLength() - { - if (this.shape == null) + public double getLength() { + if (this.shape == null) { return -1; + } - if (this.shape instanceof Polyline) - return ((Polyline) this.shape).getLength(); - else + if (this.shape instanceof Path) { + return ((Path) this.shape).getLength(); + } else { return ((SurfaceShape) this.shape).getPerimeter(this.getWwd().getModel().getGlobe()); + } } - public double getArea() - { - return this.shape != null && this.shape instanceof SurfaceShape ? - ((SurfaceShape) this.shape).getArea(this.getWwd().getModel().getGlobe(), true) : -1; + public double getArea() { + return this.shape != null && this.shape instanceof SurfaceShape + ? ((SurfaceShape) this.shape).getArea(this.getWwd().getModel().getGlobe(), true) : -1; } - public double getWidth() - { + public double getWidth() { return this.shapeRectangle != null ? this.shapeRectangle.width : -1; } - public double getHeight() - { + public double getHeight() { return this.shapeRectangle != null ? this.shapeRectangle.height : -1; } - public Angle getOrientation() - { + public Angle getOrientation() { return this.shapeOrientation; } - public Position getCenterPosition() - { + public Position getCenterPosition() { return this.shapeCenterPosition; } // *** Editing shapes *** - - /** Add a control point to the current measure shape at the cuurrent WorldWindow position. */ - public void addControlPoint() - { + /** + * Add a control point to the current measure shape at the cuurrent WorldWindow position. + */ + public void addControlPoint() { Position curPos = this.getWwd().getCurrentPosition(); - if (curPos == null) + if (curPos == null) { return; + } - if (this.isRegularShape()) - { + if (this.isRegularShape()) { // Regular shapes are defined in two steps: 1. center, 2. east point. - if (this.shapeCenterPosition == null) - { + if (this.shapeCenterPosition == null) { this.shapeCenterPosition = curPos; updateShapeControlPoints(); - } - else if (this.shapeRectangle == null) - { + } else if (this.shapeRectangle == null) { // Compute shape rectangle and heading, curPos being east of center updateShapeProperties("East", curPos); // Update or create control points updateShapeControlPoints(); } - } - else - { - if (!this.measureShapeType.equals(AVKey.SHAPE_POLYGON) || this.positions.size() <= 1) - { + } else { + if (!this.measureShapeType.equals(AVKey.SHAPE_POLYGON) || this.positions.size() <= 1) { // Line, path or polygons with less then two points this.positions.add(curPos); addControlPoint(this.positions.get(this.positions.size() - 1), "PositionIndex", - this.positions.size() - 1); - if (this.measureShapeType.equals(AVKey.SHAPE_POLYGON) && this.positions.size() == 2) - { + this.positions.size() - 1); + if (this.measureShapeType.equals(AVKey.SHAPE_POLYGON) && this.positions.size() == 2) { // Once we have two points of a polygon, add an extra position // to loop back to the first position and have a closed shape this.positions.add(this.positions.get(0)); } - if (this.measureShapeType.equals(AVKey.SHAPE_LINE) && this.positions.size() > 1) - { + if (this.measureShapeType.equals(AVKey.SHAPE_LINE) && this.positions.size() > 1) { // Two points on a line, update line heading info this.shapeOrientation = LatLon.greatCircleAzimuth(this.positions.get(0), this.positions.get(1)); } - } - else - { + } else { // For polygons with more then 2 points, the last position is the same as the first, so insert before it this.positions.add(positions.size() - 1, curPos); addControlPoint(this.positions.get(this.positions.size() - 2), "PositionIndex", - this.positions.size() - 2); + this.positions.size() - 2); } } // Update screen shapes @@ -517,49 +481,43 @@ else if (this.shapeRectangle == null) this.getWwd().redraw(); } - /** Remove the last control point from the current measure shape. */ - public void removeControlPoint() - { + /** + * Remove the last control point from the current measure shape. + */ + public void removeControlPoint() { Position currentLastPosition = null; - if (this.isRegularShape()) - { - if (this.shapeRectangle != null) - { + if (this.isRegularShape()) { + if (this.shapeRectangle != null) { this.shapeRectangle = null; this.shapeOrientation = null; this.positions.clear(); // remove all control points except center which is first - while (this.getControlPoints().size() > 1) - { + while (this.getControlPoints().size() > 1) { this.getControlPoints().remove(1); } - } - else if (this.shapeCenterPosition != null) - { + } else if (this.shapeCenterPosition != null) { this.shapeCenterPosition = null; this.getControlPoints().clear(); } - } - else - { - if (this.positions.size() == 0) + } else { + if (this.positions.size() == 0) { return; + } - if (!this.measureShapeType.equals(AVKey.SHAPE_POLYGON) || this.positions.size() == 1) - { + if (!this.measureShapeType.equals(AVKey.SHAPE_POLYGON) || this.positions.size() == 1) { currentLastPosition = this.positions.get(this.positions.size() - 1); this.positions.remove(this.positions.size() - 1); - } - else - { + } else { // For polygons with more then 2 points, the last position is the same as the first, so remove before it currentLastPosition = this.positions.get(this.positions.size() - 2); this.positions.remove(this.positions.size() - 2); - if (positions.size() == 2) + if (positions.size() == 2) { positions.remove(1); // remove last loop position when a polygon shrank to only two (same) positions + } } - if (this.getControlPoints().size() > 0) + if (this.getControlPoints().size() > 0) { this.getControlPoints().remove(this.getControlPoints().size() - 1); + } } // Update screen shapes @@ -573,35 +531,33 @@ else if (this.shapeCenterPosition != null) * * @param point one of the shape control points. */ - public void moveControlPoint(ControlPoint point) - { - if (point == null) - { + public void moveControlPoint(ControlPoint point) { + if (point == null) { String msg = Logging.getMessage("nullValue.PointIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (point.getValue("Control") != null) - { + if (point.getValue("Control") != null) { // Update shape properties updateShapeProperties((String) point.getValue("Control"), point.getPosition()); updateShapeControlPoints(); //positions = makeShapePositions(); } - if (point.getValue("PositionIndex") != null) - { + if (point.getValue("PositionIndex") != null) { int positionIndex = (Integer) point.getValue("PositionIndex"); // Update positions Position surfacePosition = computeSurfacePosition(point.getPosition()); positions.set(positionIndex, surfacePosition); // Update last pos too if polygon and first pos changed - if (measureShapeType.equals(AVKey.SHAPE_POLYGON) && positions.size() > 2 && positionIndex == 0) + if (measureShapeType.equals(AVKey.SHAPE_POLYGON) && positions.size() > 2 && positionIndex == 0) { positions.set(positions.size() - 1, surfacePosition); + } // Update heading for simple line - if (measureShapeType.equals(AVKey.SHAPE_LINE) && positions.size() > 1) + if (measureShapeType.equals(AVKey.SHAPE_LINE) && positions.size() > 1) { shapeOrientation = LatLon.greatCircleAzimuth(positions.get(0), positions.get(1)); + } } // Update rendered shapes @@ -612,128 +568,113 @@ public void moveControlPoint(ControlPoint point) * Move the current measure shape along a great circle arc at a given azimuth Angle for a given * distance Angle. * - * @param azimuth the azimuth Angle. + * @param azimuth the azimuth Angle. * @param distance the distance Angle. */ - public void moveMeasureShape(Angle azimuth, Angle distance) - { - if (distance == null) - { + public void moveMeasureShape(Angle azimuth, Angle distance) { + if (distance == null) { String msg = Logging.getMessage("nullValue.AngleIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (azimuth == null) - { + if (azimuth == null) { String msg = Logging.getMessage("nullValue.AngleIsNull"); Logging.logger().severe(msg); throw new IllegalArgumentException(msg); } - if (this.isRegularShape()) - { + if (this.isRegularShape()) { // Move regular shape center - if (getControlPoints().size() > 0) - { + if (getControlPoints().size() > 0) { ControlPoint point = getControlPoints().get(0); point.setPosition( - new Position(LatLon.greatCircleEndPosition(point.getPosition(), azimuth, distance), 0)); + new Position(LatLon.greatCircleEndPosition(point.getPosition(), azimuth, distance), 0)); moveControlPoint(point); } - } - else - { + } else { // Move all positions and control points - for (int i = 0; i < positions.size(); i++) - { + for (int i = 0; i < positions.size(); i++) { Position newPos = computeSurfacePosition( - LatLon.greatCircleEndPosition(positions.get(i), azimuth, distance)); + LatLon.greatCircleEndPosition(positions.get(i), azimuth, distance)); positions.set(i, newPos); - if (!this.measureShapeType.equals(AVKey.SHAPE_POLYGON) || i < positions.size() - 1) + if (!this.measureShapeType.equals(AVKey.SHAPE_POLYGON) || i < positions.size() - 1) { getControlPoints().get(i).setPosition(new Position(newPos, 0)); + } } // Update heading for simple line - if (measureShapeType.equals(AVKey.SHAPE_LINE) && positions.size() > 1) + if (measureShapeType.equals(AVKey.SHAPE_LINE) && positions.size() > 1) { shapeOrientation = LatLon.greatCircleAzimuth(positions.get(0), positions.get(1)); + } // Update rendered shapes updateMeasureShape(); } } - protected Position computeSurfacePosition(LatLon latLon) - { + protected Position computeSurfacePosition(LatLon latLon) { Vec4 surfacePoint = getWwd().getSceneController().getTerrain().getSurfacePoint(latLon.getLatitude(), - latLon.getLongitude()); - if (surfacePoint != null) + latLon.getLongitude()); + if (surfacePoint != null) { return getWwd().getModel().getGlobe().computePositionFromPoint(surfacePoint); - else + } else { return new Position(latLon, getWwd().getModel().getGlobe().getElevation(latLon.getLatitude(), - latLon.getLongitude())); + latLon.getLongitude())); + } } - protected void updateShapeProperties(String control, Position newPosition) - { - if (control.equals("Center")) - { + protected void updateShapeProperties(String control, Position newPosition) { + if (control.equals("Center")) { // Update center position this.shapeCenterPosition = newPosition; - } - else - { + } else { // Compute shape rectangle and heading double headingOffset = control.equals("East") ? 90 - : control.equals("South") ? 180 + : control.equals("South") ? 180 : control.equals("West") ? 270 - : 0; + : 0; this.shapeOrientation = LatLon.greatCircleAzimuth(this.shapeCenterPosition, newPosition) - .subtractDegrees(headingOffset); + .subtractDegrees(headingOffset); // Compute distance - have a minimal distance to avoid zero sized shape Angle distanceAngle = LatLon.greatCircleDistance(this.shapeCenterPosition, newPosition); double distance = Math.max(distanceAngle.radians * getWwd().getModel().getGlobe().getRadius(), .1); double width, height; - if (control.equals("East") || control.equals("West")) - { + if (control.equals("East") || control.equals("West")) { width = distance * 2; height = this.shapeRectangle != null ? this.shapeRectangle.height : width; if (this.measureShapeType.equals(AVKey.SHAPE_CIRCLE) || this.measureShapeType.equals( - AVKey.SHAPE_SQUARE)) - //noinspection SuspiciousNameCombination + AVKey.SHAPE_SQUARE)) //noinspection SuspiciousNameCombination + { height = width; - else if (this.isActive()) + } else if (this.isActive()) { height = width * .6; // during shape creation - } - else - { + } + } else { height = distance * 2; width = this.shapeRectangle != null ? this.shapeRectangle.width : height; if (this.measureShapeType.equals(AVKey.SHAPE_CIRCLE) || this.measureShapeType.equals( - AVKey.SHAPE_SQUARE)) - //noinspection SuspiciousNameCombination + AVKey.SHAPE_SQUARE)) //noinspection SuspiciousNameCombination + { width = height; - else if (this.isActive()) + } else if (this.isActive()) { width = height * 0.6; // during shape creation + } } this.shapeRectangle = new Rectangle2D.Double(0, 0, width, height); } } - protected void updateShapeControlPoints() - { - if (this.shapeCenterPosition != null && this.getControlPoints().size() < 1) - { + protected void updateShapeControlPoints() { + if (this.shapeCenterPosition != null && this.getControlPoints().size() < 1) { // Create center control point addControlPoint(Position.ZERO, "Control", "Center"); } - if (this.shapeCenterPosition != null) - { + if (this.shapeCenterPosition != null) { // Update center control point position this.getControlPoints().get(0).setPosition(new Position(this.shapeCenterPosition, 0)); } - if (this.shapeRectangle != null && this.getControlPoints().size() < 5) - { + if (this.shapeRectangle != null && this.getControlPoints().size() < 5) { // Add control points in four directions addControlPoint(Position.ZERO, "Control", "North"); addControlPoint(Position.ZERO, "Control", "East"); @@ -741,69 +682,59 @@ protected void updateShapeControlPoints() addControlPoint(Position.ZERO, "Control", "West"); } - if (this.shapeRectangle != null) - { + if (this.shapeRectangle != null) { Angle halfWidthAngle = Angle.fromRadians(this.shapeRectangle.width / 2 - / getWwd().getModel().getGlobe().getRadius()); + / getWwd().getModel().getGlobe().getRadius()); Angle halfHeightAngle = Angle.fromRadians(this.shapeRectangle.height / 2 - / getWwd().getModel().getGlobe().getRadius()); + / getWwd().getModel().getGlobe().getRadius()); // Update control points positions in four directions Position controlPos; // North controlPos = new Position(LatLon.greatCircleEndPosition( - this.shapeCenterPosition, this.shapeOrientation, halfHeightAngle), 0); + this.shapeCenterPosition, this.shapeOrientation, halfHeightAngle), 0); getControlPoints().get(1).setPosition(controlPos); // East controlPos = new Position(LatLon.greatCircleEndPosition( - this.shapeCenterPosition, this.shapeOrientation.addDegrees(90), halfWidthAngle), 0); + this.shapeCenterPosition, this.shapeOrientation.addDegrees(90), halfWidthAngle), 0); getControlPoints().get(2).setPosition(controlPos); // South controlPos = new Position(LatLon.greatCircleEndPosition( - this.shapeCenterPosition, this.shapeOrientation.addDegrees(180), halfHeightAngle), 0); + this.shapeCenterPosition, this.shapeOrientation.addDegrees(180), halfHeightAngle), 0); getControlPoints().get(3).setPosition(controlPos); // West controlPos = new Position(LatLon.greatCircleEndPosition( - this.shapeCenterPosition, this.shapeOrientation.addDegrees(270), halfWidthAngle), 0); + this.shapeCenterPosition, this.shapeOrientation.addDegrees(270), halfWidthAngle), 0); getControlPoints().get(4).setPosition(controlPos); } } - protected void updateMeasureShape() - { + protected void updateMeasureShape() { // Update line - if (this.measureShapeType.equals(AVKey.SHAPE_LINE) || this.measureShapeType.equals(AVKey.SHAPE_PATH)) - { + if (this.measureShapeType.equals(AVKey.SHAPE_LINE) || this.measureShapeType.equals(AVKey.SHAPE_PATH)) { // Update current line - if (this.positions.size() > 1 && this.shape != null) - ((Polyline) this.shape).setPositions(this.positions); - } - // Update polygon - else if (this.measureShapeType.equals(AVKey.SHAPE_POLYGON)) - { - if (this.shape != null) - { + if (this.positions.size() > 1 && this.shape != null) { + ((Path) this.shape).setPositions(this.positions); + } + } // Update polygon + else if (this.measureShapeType.equals(AVKey.SHAPE_POLYGON)) { + if (this.shape != null) { // Update current shape ((SurfacePolygon) this.shape).setLocations(this.positions); } - } - // Update regular shape - else if (this.isRegularShape()) - { - if (this.shape != null && this.shapeRectangle != null) - { + } // Update regular shape + else if (this.isRegularShape()) { + if (this.shape != null && this.shapeRectangle != null) { // Update current shape - if (this.measureShapeType.equals(AVKey.SHAPE_QUAD) || this.measureShapeType.equals(AVKey.SHAPE_SQUARE)) - { + if (this.measureShapeType.equals(AVKey.SHAPE_QUAD) || this.measureShapeType.equals(AVKey.SHAPE_SQUARE)) { ((SurfaceQuad) this.shape).setCenter(this.shapeCenterPosition); ((SurfaceQuad) this.shape).setSize(this.shapeRectangle.width, this.shapeRectangle.height); ((SurfaceQuad) this.shape).setHeading(this.shapeOrientation); } if (this.measureShapeType.equals(AVKey.SHAPE_ELLIPSE) || this.measureShapeType.equals( - AVKey.SHAPE_CIRCLE)) - { + AVKey.SHAPE_CIRCLE)) { ((SurfaceEllipse) this.shape).setCenter(this.shapeCenterPosition); ((SurfaceEllipse) this.shape).setRadii(this.shapeRectangle.width / 2, - this.shapeRectangle.height / 2); + this.shapeRectangle.height / 2); ((SurfaceEllipse) this.shape).setHeading(this.shapeOrientation); } // Update position from shape list with zero elevation @@ -812,53 +743,43 @@ else if (this.isRegularShape()) } } - protected void updatePositionsFromShape() - { + protected void updatePositionsFromShape() { Globe globe = this.getWwd().getModel().getGlobe(); this.positions.clear(); Iterable locations = ((SurfaceShape) this.shape).getLocations(globe); - if (locations != null) - { - for (LatLon latLon : locations) - { + if (locations != null) { + for (LatLon latLon : locations) { this.positions.add(new Position(latLon, 0)); } } } - protected void addControlPoint(Position position, String key, Object value) - { + protected void addControlPoint(Position position, String key, Object value) { ControlPoint controlPoint = createControlPoint(new Position(position, 0)); controlPoint.setValue(key, value); this.getControlPoints().add(controlPoint); } ///////////// Controller /////////////// - - protected boolean isActive() - { + protected boolean isActive() { return this.active; } - protected void setActive(boolean state) - { + protected void setActive(boolean state) { this.active = state; } - protected boolean isMoving() - { + protected boolean isMoving() { return this.moving; } - protected void setMoving(boolean state) - { + protected void setMoving(boolean state) { this.moving = state; } - public boolean isArmed() - { + public boolean isArmed() { return this.armed; } @@ -868,61 +789,49 @@ public boolean isArmed() * * @param armed true to arm the controller, false to disarm it. */ - public void setArmed(boolean armed) - { - if (this.armed != armed) - { + public void setArmed(boolean armed) { + if (this.armed != armed) { this.armed = armed; this.firePropertyChange(WWOMeasureTool.EVENT_ARMED, !armed, armed); } } // Handle mouse actions - public void mousePressed(MouseEvent mouseEvent) - { - if (this.isArmed() && this.useRubberBand && mouseEvent.getButton() == MouseEvent.BUTTON1) - { - if ((mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) - { - if (!mouseEvent.isControlDown()) - { + public void mousePressed(MouseEvent mouseEvent) { + if (this.isArmed() && this.useRubberBand && mouseEvent.getButton() == MouseEvent.BUTTON1) { + if ((mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) { + if (!mouseEvent.isControlDown()) { this.setActive(true); this.addControlPoint(); - if (this.getControlPoints().size() == 1) - { + if (this.getControlPoints().size() == 1) { this.addControlPoint(); // Simulate a second click } // Set the rubber band target to the last control point or the east one for regular shapes. rubberBandTarget = this.getControlPoints().get( - this.isRegularShape() ? 2 : this.getControlPoints().size() - 1); + this.isRegularShape() ? 2 : this.getControlPoints().size() - 1); this.firePropertyChange(WWOMeasureTool.EVENT_RUBBERBAND_START, null, null); } } mouseEvent.consume(); - } - else if (!this.isArmed() && mouseEvent.getButton() == MouseEvent.BUTTON1 && mouseEvent.isAltDown()) - { + } else if (!this.isArmed() && mouseEvent.getButton() == MouseEvent.BUTTON1 && mouseEvent.isAltDown()) { this.setMoving(true); this.movingTarget = this.lastPickedObject; mouseEvent.consume(); } } - public void mouseReleased(MouseEvent mouseEvent) - { - if (this.isArmed() && this.useRubberBand && mouseEvent.getButton() == MouseEvent.BUTTON1) - { - if (this.useRubberBand && this.getPositions().size() == 1) + public void mouseReleased(MouseEvent mouseEvent) { + if (this.isArmed() && this.useRubberBand && mouseEvent.getButton() == MouseEvent.BUTTON1) { + if (this.useRubberBand && this.getPositions().size() == 1) { this.removeControlPoint(); + } this.setActive(false); rubberBandTarget = null; // Disarm after second control point of a line or regular shape autoDisarm(); mouseEvent.consume(); this.firePropertyChange(WWOMeasureTool.EVENT_RUBBERBAND_STOP, null, null); - } - else if (this.isMoving() && mouseEvent.getButton() == MouseEvent.BUTTON1) - { + } else if (this.isMoving() && mouseEvent.getButton() == MouseEvent.BUTTON1) { this.setMoving(false); this.movingTarget = null; mouseEvent.consume(); @@ -930,14 +839,11 @@ else if (this.isMoving() && mouseEvent.getButton() == MouseEvent.BUTTON1) } // Handle single click for removing control points - public void mouseClicked(MouseEvent mouseEvent) - { - if (this.isArmed() && mouseEvent.getButton() == MouseEvent.BUTTON1) - { - if (mouseEvent.isControlDown()) + public void mouseClicked(MouseEvent mouseEvent) { + if (this.isArmed() && mouseEvent.getButton() == MouseEvent.BUTTON1) { + if (mouseEvent.isControlDown()) { this.removeControlPoint(); - else if (!this.useRubberBand) - { + } else if (!this.useRubberBand) { this.addControlPoint(); // Disarm after second control point of a line or regular shape autoDisarm(); @@ -947,10 +853,8 @@ else if (!this.useRubberBand) } // Handle mouse motion - public void mouseDragged(MouseEvent mouseEvent) - { - if (this.isArmed() && (mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) - { + public void mouseDragged(MouseEvent mouseEvent) { + if (this.isArmed() && (mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) { // Don't update the control point here because the wwd current cursor position will not // have been updated to reflect the current mouse position. Wait to update in the // position listener, but consume the event so the view doesn't respond to it. @@ -958,37 +862,36 @@ public void mouseDragged(MouseEvent mouseEvent) } } - public void mouseMoved(MouseEvent mouseEvent) - { + public void mouseMoved(MouseEvent mouseEvent) { } - public void mouseEntered(MouseEvent e) - { + public void mouseEntered(MouseEvent e) { }// Handle cursor position change for rubber band - public void mouseExited(MouseEvent e) - { + public void mouseExited(MouseEvent e) { } - public void moved(PositionEvent event) - { - if ((!this.active && !this.moving)) + public void moved(PositionEvent event) { + if ((!this.active && !this.moving)) { return; + } this.doMoved(); } // Handle dragging of control points - public void selected(SelectEvent event) - { - if ((this.isArmed() && this.useRubberBand)) + public void selected(SelectEvent event) { + if ((this.isArmed() && this.useRubberBand)) { return; + } - if (dragger == null) + if (dragger == null) { dragger = new BasicDragger(this.getWwd()); + } - if (event.getEventAction().equals(SelectEvent.ROLLOVER)) + if (event.getEventAction().equals(SelectEvent.ROLLOVER)) { highlight(event.getTopObject()); + } this.doSelected(event); } @@ -1002,40 +905,32 @@ public void stageChanged(RenderingEvent event) // TODO: Why? // } } - protected void doMoved() - { - if (this.active && rubberBandTarget != null && this.getWwd().getCurrentPosition() != null) - { + protected void doMoved() { + if (this.active && rubberBandTarget != null && this.getWwd().getCurrentPosition() != null) { if (!this.freeHand || (!this.getMeasureShapeType().equals(AVKey.SHAPE_PATH) - && !this.getMeasureShapeType().equals(AVKey.SHAPE_POLYGON))) - { + && !this.getMeasureShapeType().equals(AVKey.SHAPE_POLYGON))) { // Rubber band - Move control point and update shape Position lastPosition = rubberBandTarget.getPosition(); rubberBandTarget.setPosition(new Position(this.getWwd().getCurrentPosition(), 0)); this.moveControlPoint(rubberBandTarget); this.firePropertyChange(WWOMeasureTool.EVENT_POSITION_REPLACE, - lastPosition, rubberBandTarget.getPosition()); + lastPosition, rubberBandTarget.getPosition()); this.getWwd().redraw(); - } - else - { + } else { // Free hand - Compute distance from current control point (rubber band target) Position lastPosition = rubberBandTarget.getPosition(); Position newPosition = this.getWwd().getCurrentPosition(); double distance = LatLon.greatCircleDistance(lastPosition, newPosition).radians - * this.getWwd().getModel().getGlobe().getRadius(); - if (distance >= freeHandMinSpacing) - { + * this.getWwd().getModel().getGlobe().getRadius(); + if (distance >= freeHandMinSpacing) { // Add new control point this.addControlPoint(); rubberBandTarget = this.getControlPoints().get( - this.getControlPoints().size() - 1); + this.getControlPoints().size() - 1); this.getWwd().redraw(); } } - } - else if (this.moving && movingTarget != null && this.getWwd().getCurrentPosition() != null) - { + } else if (this.moving && movingTarget != null && this.getWwd().getCurrentPosition() != null) { // Moving the whole shape Position lastPosition = movingTarget.getPosition(); Position newPosition = this.getWwd().getCurrentPosition(); @@ -1044,8 +939,7 @@ else if (this.moving && movingTarget != null && this.getWwd().getCurrentPosition } } - protected void moveToPosition(Position oldPosition, Position newPosition) - { + protected void moveToPosition(Position oldPosition, Position newPosition) { Angle distanceAngle = LatLon.greatCircleDistance(oldPosition, newPosition); Angle azimuthAngle = LatLon.greatCircleAzimuth(oldPosition, newPosition); this.moveMeasureShape(azimuthAngle, distanceAngle); @@ -1054,132 +948,121 @@ protected void moveToPosition(Position oldPosition, Position newPosition) protected EventListenerList eventListeners = new EventListenerList(); - public void addSelectListener(SelectListener listener) - { + public void addSelectListener(SelectListener listener) { this.eventListeners.add(SelectListener.class, listener); } - protected void callSelectListeners(final SelectEvent event) - { - EventQueue.invokeLater(new Runnable() - { - public void run() - { - for (SelectListener listener : eventListeners.getListeners(SelectListener.class)) - { + protected void callSelectListeners(final SelectEvent event) { + EventQueue.invokeLater(new Runnable() { + public void run() { + for (SelectListener listener : eventListeners.getListeners(SelectListener.class)) { listener.selected(event); } } }); } - protected void doSelected(SelectEvent event) - { - if (event.getTopObject() != null) - { - if (event.getTopObject() instanceof WWOMeasureTool.ControlPoint) - { + protected void doSelected(SelectEvent event) { + if (event.getTopObject() != null) { + if (event.getTopObject() instanceof WWOMeasureTool.ControlPoint) { WWOMeasureTool.ControlPoint point = (WWOMeasureTool.ControlPoint) event.getTopObject(); // Check whether this control point belongs to our measure tool - if (point.getParent() != this) + if (point.getParent() != this) { return; + } // Have rollover events highlight the rolled-over object. - if (event.getEventAction().equals(SelectEvent.ROLLOVER) && !this.dragger.isDragging()) - { + if (event.getEventAction().equals(SelectEvent.ROLLOVER) && !this.dragger.isDragging()) { this.highlight(point); - } - // Have drag events drag the selected object. + } // Have drag events drag the selected object. else if (movingTarget == null && (event.getEventAction().equals(SelectEvent.DRAG_END) - || event.getEventAction().equals(SelectEvent.DRAG))) - { + || event.getEventAction().equals(SelectEvent.DRAG))) { this.dragSelected(event); } - } - else if (measureDisplay.isAnnotation(event.getTopObject())) - { + } else if (measureDisplay.isAnnotation(event.getTopObject())) { Position pos = null; - if (event.getObjects().getTerrainObject() != null) + if (event.getObjects().getTerrainObject() != null) { pos = event.getObjects().getTerrainObject().getPosition(); + } - if (isShowAnnotation()) + if (isShowAnnotation()) { measureDisplay.updateMeasureDisplay(pos); - } - else if (event.getTopObject() == shape) - { - for (SelectListener listener : eventListeners.getListeners(SelectListener.class)) - { + } + } else if (event.getTopObject() == shape) { + for (SelectListener listener : eventListeners.getListeners(SelectListener.class)) { listener.selected(event); } Position pos = null; - if (event.getObjects().getTerrainObject() != null) + if (event.getObjects().getTerrainObject() != null) { pos = event.getObjects().getTerrainObject().getPosition(); + } - if (isShowAnnotation()) + if (isShowAnnotation()) { measureDisplay.updateMeasureDisplay(pos); - } - else - { - if (isShowAnnotation()) + } + } else { + if (isShowAnnotation()) { measureDisplay.updateMeasureDisplay(null); + } } } } - protected void dragSelected(SelectEvent event) - { + protected void dragSelected(SelectEvent event) { WWOMeasureTool.ControlPoint point = (WWOMeasureTool.ControlPoint) event.getTopObject(); LatLon lastPosition = point.getPosition(); - if (point.getValue("PositionIndex") != null) + if (point.getValue("PositionIndex") != null) { lastPosition = this.getPositions().get((Integer) point.getValue("PositionIndex")); + } // Delegate dragging computations to a dragger. this.dragger.selected(event); this.moveControlPoint(point); - if (this.isShowAnnotation()) + if (this.isShowAnnotation()) { this.measureDisplay.updateMeasureDisplay(point.getPosition()); + } this.firePropertyChange(WWOMeasureTool.EVENT_POSITION_REPLACE, - lastPosition, point.getPosition()); + lastPosition, point.getPosition()); this.getWwd().redraw(); } - protected void highlight(Object o) - { + protected void highlight(Object o) { // Manage highlighting of control points - if (this.lastPickedObject == o) + if (this.lastPickedObject == o) { return; // Same thing selected - + } if (o != null && o instanceof WWOMeasureTool.ControlPoint - && ((WWOMeasureTool.ControlPoint) o).getParent() != this) + && ((WWOMeasureTool.ControlPoint) o).getParent() != this) { return; // Does not belong to this measure tool - + } // Turn off highlight if on. - if (this.lastPickedObject != null) - { + if (this.lastPickedObject != null) { this.lastPickedObject.highlight(false); this.lastPickedObject = null; - if (this.isShowAnnotation()) + if (this.isShowAnnotation()) { this.measureDisplay.updateMeasureDisplay(null); + } } // Turn on highlight if object selected. - if (o != null && o instanceof WWOMeasureTool.ControlPoint) - { + if (o != null && o instanceof WWOMeasureTool.ControlPoint) { this.lastPickedObject = (WWOMeasureTool.ControlPoint) o; this.lastPickedObject.highlight(true); - if (this.isShowAnnotation()) + if (this.isShowAnnotation()) { this.measureDisplay.updateMeasureDisplay(this.lastPickedObject.getPosition()); + } } } - protected void autoDisarm() - { + protected void autoDisarm() { // Disarm after second control point of a line or regular shape - if (this.isRegularShape() || this.getMeasureShapeType().equals(AVKey.SHAPE_LINE)) - if (this.getControlPoints().size() > 1) + if (this.isRegularShape() || this.getMeasureShapeType().equals(AVKey.SHAPE_LINE)) { + if (this.getControlPoints().size() > 1) { this.setArmed(false); + } + } } } diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureToolControlPoints.java b/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureToolControlPoints.java index ac4a4a4803..864ca1feb0 100644 --- a/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureToolControlPoints.java +++ b/src/gov/nasa/worldwindx/applications/worldwindow/util/measuretool/WWOMeasureToolControlPoints.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.applications.worldwindow.util.measuretool; diff --git a/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java b/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java index 7e4a9d0e4c..6a83dbb063 100644 --- a/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java +++ b/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -32,39 +54,38 @@ import java.util.zip.*; /** - * Illustrates runtime construction of 3D extruded polygons and spheres using World Wind {@link Airspace} + * Illustrates runtime construction of 3D extruded polygons and spheres using WorldWind {@link Airspace} * shapes. This uses a {@link PolygonEditor} and a {@link SphereAirspaceEditor} to enable * runtime editing of {@link Polygon} airspace and {@link SphereAirspace} shapes. - *

            *

            Usage Instructions

            - *

            - * Adding and Removing Shapes
            Add a shape by selecting either Polygon or + *

            + * Adding and Removing Shapes
            Add a shape by selecting either Polygon or * Sphere in the drop down box then clicking New shape. Delete a shape by left-clicking it * then pressing the delete key. - *

            - * Moving Shapes
            Move a shape by left-clicking and dragging it. - *

            - * Editing Spheres
            Note: a sphere must be selected before it can be edited. Select a sphere by - * left-clicking it.
            Adjust a sphere's height by holding the Shift key then left-click and drag + *

            + * Moving Shapes
            Move a shape by left-clicking and dragging it. + *

            + * Editing Spheres
            Note: a sphere must be selected before it can be edited. Select a sphere by + * left-clicking it.
            Adjust a sphere's height by holding the Shift key then left-click and drag * the sphere. Resize a sphere by moving the cursor toward the sphere's edge until a blue control point appears, then * left-click and drag the control point. - *

            - * Editing Polygons
            Note: a polygon must be selected before it can be edited. Select a polygon - * by left-clicking it.
            Add a polygon vertex by holding the Alt key and left-clicking anywhere + *

            + * Editing Polygons
            Note: a polygon must be selected before it can be edited. Select a polygon + * by left-clicking it.
            Add a polygon vertex by holding the Alt key and left-clicking anywhere * near the polygon. Remove a polygon control point by holding the Control key and left-clicking the blue * sphere at the vertex. Move a polygon vertex by left-clicking and dragging it. Change a polygon's bottom or top height * by holding the Shift key then left-click any blue sphere at a vertex and drag it. - *

            *

            Demo Shapes

            - *

            - * Select File -> Load Demo Shapes to display a set of polygon airspace shapes built with this editor. The - * data for these shapes is located in the World Wind project under src/gov/nasa/worldwindx/examples/data/AirspaceBuilder-DemoShapes.zip. + *

            + * Select File -> Load Demo Shapes to display a set of polygon airspace shapes built with this editor. + * The data for these shapes is located in the WorldWind project under + * src/gov/nasa/worldwindx/examples/data/AirspaceBuilder-DemoShapes.zip. * * @author dcollins * @version $Id: AirspaceBuilder.java 2231 2014-08-15 19:03:12Z dcollins $ */ -public class AirspaceBuilder extends ApplicationTemplate -{ +public class AirspaceBuilder extends ApplicationTemplate { + protected static final String AIRSPACE_LAYER_NAME = "Airspace Shapes"; protected static final String CLEAR_SELECTION = "AirspaceBuilder.ClearSelection"; protected static final String SIZE_NEW_SHAPES_TO_VIEWPORT = "AirspaceBuilder.SizeNewShapesToViewport"; @@ -77,14 +98,13 @@ public class AirspaceBuilder extends ApplicationTemplate protected static final String SAVE = "AirspaceBuilder.Save"; protected static final String SELECTION_CHANGED = "AirspaceBuilder.SelectionChanged"; protected static final String DEMO_AIRSPACES_PATH - = "gov/nasa/worldwindx/examples/data/AirspaceBuilder-DemoShapes.zip"; + = "gov/nasa/worldwindx/examples/data/AirspaceBuilder-DemoShapes.zip"; //**************************************************************// //******************** Airspace Builder Model ****************// //**************************************************************// + protected static class AirspaceEntry extends WWObjectImpl { - protected static class AirspaceEntry extends WWObjectImpl - { protected Airspace airspace; protected AirspaceEditor editor; protected AirspaceAttributes attributes; @@ -92,181 +112,152 @@ protected static class AirspaceEntry extends WWObjectImpl protected boolean selected = false; protected boolean intersecting = false; - public AirspaceEntry(Airspace airspace, AirspaceEditor editor) - { + public AirspaceEntry(Airspace airspace, AirspaceEditor editor) { this.airspace = airspace; this.editor = editor; this.attributes = this.airspace.getAttributes(); } - public boolean isEditing() - { + public boolean isEditing() { return this.editing; } - public void setEditing(boolean editing) - { + public void setEditing(boolean editing) { this.editing = editing; this.updateAttributes(); } - public boolean isSelected() - { + public boolean isSelected() { return this.selected; } - public void setSelected(boolean selected) - { + public void setSelected(boolean selected) { this.selected = selected; this.updateAttributes(); } - public boolean isIntersecting() - { + public boolean isIntersecting() { return this.intersecting; } - public void setIntersecting(boolean intersecting) - { + public void setIntersecting(boolean intersecting) { this.intersecting = intersecting; this.updateAttributes(); } - public String getName() - { + public String getName() { return this.getStringValue(AVKey.DISPLAY_NAME); } - public void setName(String name) - { + public void setName(String name) { this.setValue(AVKey.DISPLAY_NAME, name); } - public Airspace getAirspace() - { + public Airspace getAirspace() { return airspace; } - public AirspaceEditor getEditor() - { + public AirspaceEditor getEditor() { return editor; } - public AirspaceAttributes getAttributes() - { + public AirspaceAttributes getAttributes() { return this.attributes; } - public String toString() - { + @Override + public String toString() { return this.getName(); } - public Object getValue(String key) - { + @Override + public Object getValue(String key) { Object value = super.getValue(key); - if (value == null) - { + if (value == null) { value = this.airspace.getValue(key); } return value; } - public Object setValue(String key, Object value) - { - if (AVKey.DISPLAY_NAME.equals(key)) - { + @Override + public Object setValue(String key, Object value) { + if (AVKey.DISPLAY_NAME.equals(key)) { return this.airspace.setValue(key, value); - } - else - { + } else { return super.setValue(key, value); } } - protected void updateAttributes() - { - if (this.isSelected() && this.isIntersecting()) - { + protected void updateAttributes() { + if (this.isSelected() && this.isIntersecting()) { this.airspace.setAttributes(getSelectionAndIntersectionAttributes()); - } - else if (this.isSelected()) - { + } else if (this.isSelected()) { this.airspace.setAttributes(getSelectionAttributes()); - } - else if (this.isIntersecting()) - { + } else if (this.isIntersecting()) { this.airspace.setAttributes(getIntersectionAttributes()); - } - else - { + } else { this.airspace.setAttributes(this.getAttributes()); } } } - protected static class AirspaceBuilderModel extends AbstractTableModel - { + protected static class AirspaceBuilderModel extends AbstractTableModel { + protected static String[] columnName = {"Name"}; protected static Class[] columnClass = {String.class}; protected static String[] columnAttribute = {AVKey.DISPLAY_NAME}; - protected ArrayList entryList = new ArrayList(); + protected ArrayList entryList = new ArrayList<>(); - public AirspaceBuilderModel() - { + public AirspaceBuilderModel() { } - public String getColumnName(int columnIndex) - { + @Override + public String getColumnName(int columnIndex) { return columnName[columnIndex]; } - public Class getColumnClass(int columnIndex) - { + @Override + public Class getColumnClass(int columnIndex) { return columnClass[columnIndex]; } - public int getRowCount() - { + @Override + public int getRowCount() { return this.entryList.size(); } - public int getColumnCount() - { + @Override + public int getColumnCount() { return 1; } - public boolean isCellEditable(int rowIndex, int columnIndex) - { + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { return true; } - public Object getValueAt(int rowIndex, int columnIndex) - { + @Override + public Object getValueAt(int rowIndex, int columnIndex) { AirspaceEntry entry = this.entryList.get(rowIndex); return entry.getValue(columnAttribute[columnIndex]); } - public void setValueAt(Object aObject, int rowIndex, int columnIndex) - { + @Override + public void setValueAt(Object aObject, int rowIndex, int columnIndex) { AirspaceEntry entry = this.entryList.get(rowIndex); String key = columnAttribute[columnIndex]; entry.setValue(key, aObject); } - public java.util.List getEntries() - { + public java.util.List getEntries() { return Collections.unmodifiableList(this.entryList); } - public void setEntries(Iterable entries) - { + public void setEntries(Iterable entries) { this.entryList.clear(); - if (entries != null) - { - for (AirspaceEntry entry : entries) - { + if (entries != null) { + for (AirspaceEntry entry : entries) { this.entryList.add(entry); } } @@ -274,68 +265,59 @@ public void setEntries(Iterable entries) this.fireTableDataChanged(); } - public void addEntry(AirspaceEntry entry) - { + public void addEntry(AirspaceEntry entry) { this.entryList.add(entry); int index = this.entryList.size() - 1; this.fireTableRowsInserted(index, index); } - public void removeEntry(AirspaceEntry entry) - { + public void removeEntry(AirspaceEntry entry) { int index = this.entryList.indexOf(entry); - if (index != -1) - { + if (index != -1) { this.entryList.remove(entry); this.fireTableRowsDeleted(index, index); } } - public void removeAllEntries() - { + public void removeAllEntries() { this.entryList.clear(); this.fireTableDataChanged(); } - public AirspaceEntry getEntry(int index) - { + public AirspaceEntry getEntry(int index) { return this.entryList.get(index); } - public AirspaceEntry setEntry(int index, AirspaceEntry entry) - { + public AirspaceEntry setEntry(int index, AirspaceEntry entry) { return this.entryList.set(index, entry); } - public int getIndexForEntry(AirspaceEntry entry) - { + public int getIndexForEntry(AirspaceEntry entry) { return this.entryList.indexOf(entry); } } - protected static AirspaceFactory[] defaultAirspaceFactories = new AirspaceFactory[] - { - new PolygonAirspaceFactory(), - new SphereAirspaceFactory() - }; + protected static AirspaceFactory[] defaultAirspaceFactories = new AirspaceFactory[]{ + new PolygonAirspaceFactory(), + new SphereAirspaceFactory() + }; protected static final double DEFAULT_SHAPE_SIZE_METERS = 200000.0; // 200 km - protected interface AirspaceFactory - { + protected interface AirspaceFactory { + Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport); AirspaceEditor createEditor(Airspace airspace); } - protected static class PolygonAirspaceFactory implements AirspaceFactory - { - public PolygonAirspaceFactory() - { + protected static class PolygonAirspaceFactory implements AirspaceFactory { + + public PolygonAirspaceFactory() { } - public Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport) - { + @Override + public Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport) { Polygon poly = new Polygon(); poly.setAttributes(getDefaultAttributes()); poly.setValue(AVKey.DISPLAY_NAME, getNextName(toString())); @@ -346,33 +328,32 @@ public Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport) return poly; } - public AirspaceEditor createEditor(Airspace airspace) - { + @Override + public AirspaceEditor createEditor(Airspace airspace) { PolygonEditor editor = new PolygonEditor(); editor.setPolygon((Polygon) airspace); setEditorAttributes(editor); return editor; } - protected void initializePolygon(WorldWindow wwd, Polygon polygon, boolean fitShapeToViewport) - { + protected void initializePolygon(WorldWindow wwd, Polygon polygon, boolean fitShapeToViewport) { // Creates a rectangle in the center of the viewport. Attempts to guess at a reasonable size and height. Position position = ShapeUtils.getNewShapePosition(wwd); Angle heading = ShapeUtils.getNewShapeHeading(wwd, true); - double sizeInMeters = fitShapeToViewport ? - ShapeUtils.getViewportScaleFactor(wwd) : DEFAULT_SHAPE_SIZE_METERS; + double sizeInMeters = fitShapeToViewport + ? ShapeUtils.getViewportScaleFactor(wwd) : DEFAULT_SHAPE_SIZE_METERS; java.util.List locations = ShapeUtils.createSquareInViewport(wwd, position, heading, sizeInMeters); double maxElevation = -Double.MAX_VALUE; Globe globe = wwd.getModel().getGlobe(); - for (LatLon ll : locations) - { + for (LatLon ll : locations) { double e = globe.getElevation(ll.getLatitude(), ll.getLongitude()); - if (e > maxElevation) + if (e > maxElevation) { maxElevation = e; + } } polygon.setAltitudes(0.0, maxElevation + sizeInMeters); @@ -380,20 +361,19 @@ protected void initializePolygon(WorldWindow wwd, Polygon polygon, boolean fitSh polygon.setLocations(locations); } - public String toString() - { + @Override + public String toString() { return "Polygon"; } } - protected static class SphereAirspaceFactory implements AirspaceFactory - { - public SphereAirspaceFactory() - { + protected static class SphereAirspaceFactory implements AirspaceFactory { + + public SphereAirspaceFactory() { } - public Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport) - { + @Override + public Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport) { SphereAirspace sphere = new SphereAirspace(); sphere.setAttributes(getDefaultAttributes()); sphere.setValue(AVKey.DISPLAY_NAME, getNextName(toString())); @@ -404,33 +384,31 @@ public Airspace createAirspace(WorldWindow wwd, boolean fitShapeToViewport) return sphere; } - public AirspaceEditor createEditor(Airspace airspace) - { + @Override + public AirspaceEditor createEditor(Airspace airspace) { SphereAirspaceEditor editor = new SphereAirspaceEditor(); editor.setSphere((SphereAirspace) airspace); setEditorAttributes(editor); return editor; } - protected void initializeSphere(WorldWindow wwd, SphereAirspace sphere, boolean fitShapeToViewport) - { + protected void initializeSphere(WorldWindow wwd, SphereAirspace sphere, boolean fitShapeToViewport) { // Creates a sphere in the center of the viewport. Attempts to guess at a reasonable size and height. Position position = ShapeUtils.getNewShapePosition(wwd); - double sizeInMeters = fitShapeToViewport ? - ShapeUtils.getViewportScaleFactor(wwd) : DEFAULT_SHAPE_SIZE_METERS; + double sizeInMeters = fitShapeToViewport + ? ShapeUtils.getViewportScaleFactor(wwd) : DEFAULT_SHAPE_SIZE_METERS; sphere.setLocation(new LatLon(position)); sphere.setRadius(sizeInMeters / 2.0); } - public String toString() - { + @Override + public String toString() { return "Sphere"; } } - public static AirspaceAttributes getDefaultAttributes() - { + public static AirspaceAttributes getDefaultAttributes() { AirspaceAttributes attributes = new BasicAirspaceAttributes(); attributes.setInteriorMaterial(new Material(Color.BLACK, Color.LIGHT_GRAY, Color.DARK_GRAY, Color.BLACK, 0.0f)); attributes.setOutlineMaterial(Material.DARK_GRAY); @@ -441,8 +419,7 @@ public static AirspaceAttributes getDefaultAttributes() return attributes; } - public static AirspaceAttributes getSelectionAttributes() - { + public static AirspaceAttributes getSelectionAttributes() { AirspaceAttributes attributes = new BasicAirspaceAttributes(); attributes.setInteriorMaterial(Material.WHITE); attributes.setOutlineMaterial(Material.BLACK); @@ -453,47 +430,39 @@ public static AirspaceAttributes getSelectionAttributes() return attributes; } - public static AirspaceAttributes getIntersectionAttributes() - { + public static AirspaceAttributes getIntersectionAttributes() { AirspaceAttributes attributes = new BasicAirspaceAttributes(); attributes.setInteriorMaterial(Material.RED); attributes.setInteriorOpacity(0.95); return attributes; } - public static AirspaceAttributes getSelectionAndIntersectionAttributes() - { + public static AirspaceAttributes getSelectionAndIntersectionAttributes() { AirspaceAttributes attributes = new BasicAirspaceAttributes(); attributes.setInteriorMaterial(Material.ORANGE); attributes.setInteriorOpacity(0.8); return attributes; } - public static void setEditorAttributes(AirspaceEditor editor) - { + public static void setEditorAttributes(AirspaceEditor editor) { editor.setUseRubberBand(true); editor.setKeepControlPointsAboveTerrain(true); } - public static String getNextName(String base) - { + public static String getNextName(String base) { StringBuilder sb = new StringBuilder(); sb.append(base); sb.append(nextEntryNumber++); return sb.toString(); } - protected static AirspaceEditor getEditorFor(Airspace airspace) - { - if (airspace instanceof Polygon) - { + protected static AirspaceEditor getEditorFor(Airspace airspace) { + if (airspace instanceof Polygon) { PolygonEditor editor = new PolygonEditor(); editor.setPolygon((Polygon) airspace); setEditorAttributes(editor); return editor; - } - else if (airspace instanceof SphereAirspace) - { + } else if (airspace instanceof SphereAirspace) { SphereAirspaceEditor editor = new SphereAirspaceEditor(); editor.setSphere((SphereAirspace) airspace); setEditorAttributes(editor); @@ -508,55 +477,44 @@ else if (airspace instanceof SphereAirspace) //**************************************************************// //******************** Airspace Builder Panel ****************// //**************************************************************// - @SuppressWarnings("unchecked") - protected static class AirspaceBuilderPanel extends JPanel - { + protected static class AirspaceBuilderPanel extends JPanel { + protected JComboBox factoryComboBox; protected JTable entryTable; protected boolean ignoreSelectEvents = false; - public AirspaceBuilderPanel(AirspaceBuilderModel model, AirspaceBuilderController controller) - { + public AirspaceBuilderPanel(AirspaceBuilderModel model, AirspaceBuilderController controller) { this.initComponents(model, controller); } - public int[] getSelectedIndices() - { + public int[] getSelectedIndices() { return this.entryTable.getSelectedRows(); } - public void setSelectedIndices(int[] indices) - { + public void setSelectedIndices(int[] indices) { this.ignoreSelectEvents = true; - if (indices != null && indices.length != 0) - { - for (int index : indices) - { + if (indices != null && indices.length != 0) { + for (int index : indices) { this.entryTable.setRowSelectionInterval(index, index); } - } - else - { + } else { this.entryTable.clearSelection(); } this.ignoreSelectEvents = false; } - public AirspaceFactory getSelectedFactory() - { + public AirspaceFactory getSelectedFactory() { return (AirspaceFactory) this.factoryComboBox.getSelectedItem(); } - public void setSelectedFactory(AirspaceFactory factory) - { + public void setSelectedFactory(AirspaceFactory factory) { this.factoryComboBox.setSelectedItem(factory); } - protected void initComponents(AirspaceBuilderModel model, final AirspaceBuilderController controller) - { + protected void initComponents(AirspaceBuilderModel model, final AirspaceBuilderController controller) { final JCheckBox resizeNewShapesCheckBox; final JCheckBox enableEditCheckBox; @@ -606,14 +564,9 @@ protected void initComponents(AirspaceBuilderModel model, final AirspaceBuilderC this.entryTable.setColumnSelectionAllowed(false); this.entryTable.setRowSelectionAllowed(true); this.entryTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - this.entryTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() - { - public void valueChanged(ListSelectionEvent e) - { - if (!ignoreSelectEvents) - { - controller.actionPerformed(new ActionEvent(e.getSource(), -1, SELECTION_CHANGED)); - } + this.entryTable.getSelectionModel().addListSelectionListener((ListSelectionEvent e) -> { + if (!ignoreSelectEvents) { + controller.actionPerformed(new ActionEvent(e.getSource(), -1, SELECTION_CHANGED)); } }); this.entryTable.setToolTipText("Click to select
            Double-Click to rename"); @@ -651,18 +604,11 @@ public void valueChanged(ListSelectionEvent e) this.add(entryPanel, BorderLayout.CENTER); this.add(selectionPanel, BorderLayout.EAST); - controller.addPropertyChangeListener(new PropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent e) - { - if (SIZE_NEW_SHAPES_TO_VIEWPORT.equals(e.getPropertyName())) - { - resizeNewShapesCheckBox.setSelected(controller.isResizeNewShapesToViewport()); - } - else if (ENABLE_EDIT.equals(e.getPropertyName())) - { - enableEditCheckBox.setSelected(controller.isEnableEdit()); - } + controller.addPropertyChangeListener((PropertyChangeEvent e) -> { + if (SIZE_NEW_SHAPES_TO_VIEWPORT.equals(e.getPropertyName())) { + resizeNewShapesCheckBox.setSelected(controller.isResizeNewShapesToViewport()); + } else if (ENABLE_EDIT.equals(e.getPropertyName())) { + enableEditCheckBox.setSelected(controller.isEnableEdit()); } }); } @@ -671,10 +617,9 @@ else if (ENABLE_EDIT.equals(e.getPropertyName())) //**************************************************************// //******************** Airspace Builder Controller ***********// //**************************************************************// - protected static class AirspaceBuilderController extends WWObjectImpl implements ActionListener, MouseListener, - AirspaceEditListener - { + AirspaceEditListener { + protected AppFrame app; protected AirspaceBuilderModel model; protected AirspaceBuilderPanel view; @@ -686,8 +631,7 @@ protected static class AirspaceBuilderController extends WWObjectImpl implements // UI components. protected JFileChooser fileChooser; - public AirspaceBuilderController(AppFrame app) - { + public AirspaceBuilderController(AppFrame app) { this.app = app; this.editorController = new AirspaceEditorController(); @@ -696,245 +640,217 @@ public AirspaceBuilderController(AppFrame app) this.app.getWwd().getInputHandler().addMouseListener(this); } - public AppFrame getApp() - { + public AppFrame getApp() { return this.app; } - public AirspaceBuilderModel getModel() - { + public AirspaceBuilderModel getModel() { return this.model; } - public void setModel(AirspaceBuilderModel model) - { + public void setModel(AirspaceBuilderModel model) { this.model = model; } - public AirspaceBuilderPanel getView() - { + public AirspaceBuilderPanel getView() { return this.view; } - public void setView(AirspaceBuilderPanel view) - { + public void setView(AirspaceBuilderPanel view) { this.view = view; } - public boolean isEnabled() - { + public boolean isEnabled() { return this.enabled; } - public void setEnabled(boolean enabled) - { + public void setEnabled(boolean enabled) { this.enabled = enabled; getView().setEnabled(enabled); getApp().setEnabled(enabled); } - public boolean isEnableEdit() - { + public boolean isEnableEdit() { return this.enableEdit; } - public void setEnableEdit(boolean enable) - { + public void setEnableEdit(boolean enable) { this.enableEdit = enable; this.handleEnableEdit(enable); this.firePropertyChange(ENABLE_EDIT, null, enable); } - public boolean isResizeNewShapesToViewport() - { + public boolean isResizeNewShapesToViewport() { return this.resizeNewShapes; } - public void setResizeNewShapesToViewport(boolean resize) - { + public void setResizeNewShapesToViewport(boolean resize) { this.resizeNewShapes = resize; this.firePropertyChange(SIZE_NEW_SHAPES_TO_VIEWPORT, null, resize); } - public void actionPerformed(ActionEvent e) - { - if (!this.isEnabled()) - { + @Override + public void actionPerformed(ActionEvent e) { + if (!this.isEnabled()) { return; } - if (NEW_AIRSPACE.equals(e.getActionCommand())) - { - this.createNewEntry(this.getView().getSelectedFactory()); - } - else if (CLEAR_SELECTION.equals(e.getActionCommand())) - { - this.selectEntry(null, true); - } - else if (SIZE_NEW_SHAPES_TO_VIEWPORT.equals(e.getActionCommand())) - { - if (e.getSource() instanceof AbstractButton) - { - boolean selected = ((AbstractButton) e.getSource()).isSelected(); - this.setResizeNewShapesToViewport(selected); - } - } - else if (ENABLE_EDIT.equals(e.getActionCommand())) - { - if (e.getSource() instanceof AbstractButton) - { - boolean selected = ((AbstractButton) e.getSource()).isSelected(); - this.setEnableEdit(selected); + if (null != e.getActionCommand()) { + switch (e.getActionCommand()) { + case NEW_AIRSPACE: + this.createNewEntry(this.getView().getSelectedFactory()); + break; + case CLEAR_SELECTION: + this.selectEntry(null, true); + break; + case SIZE_NEW_SHAPES_TO_VIEWPORT: + if (e.getSource() instanceof AbstractButton) { + boolean selected = ((AbstractButton) e.getSource()).isSelected(); + this.setResizeNewShapesToViewport(selected); + } + break; + case ENABLE_EDIT: + if (e.getSource() instanceof AbstractButton) { + boolean selected = ((AbstractButton) e.getSource()).isSelected(); + this.setEnableEdit(selected); + } + break; + case OPEN: + this.openFromFile(); + break; + case OPEN_URL: + this.openFromURL(); + break; + case OPEN_DEMO_AIRSPACES: + this.openFromPath(DEMO_AIRSPACES_PATH); + this.zoomTo(LatLon.fromDegrees(47.6584074779224, -122.3059199579634), + Angle.fromDegrees(-152), Angle.fromDegrees(75), 750); + break; + case REMOVE_SELECTED: + this.removeEntries(Arrays.asList(this.getSelectedEntries())); + break; + case SAVE: + this.saveToFile(); + break; + case SELECTION_CHANGED: + this.viewSelectionChanged(); + break; + default: + break; } } - else if (OPEN.equals(e.getActionCommand())) - { - this.openFromFile(); - } - else if (OPEN_URL.equals(e.getActionCommand())) - { - this.openFromURL(); - } - else if (OPEN_DEMO_AIRSPACES.equals(e.getActionCommand())) - { - this.openFromPath(DEMO_AIRSPACES_PATH); - this.zoomTo(LatLon.fromDegrees(47.6584074779224, -122.3059199579634), - Angle.fromDegrees(-152), Angle.fromDegrees(75), 750); - } - else if (REMOVE_SELECTED.equals(e.getActionCommand())) - { - this.removeEntries(Arrays.asList(this.getSelectedEntries())); - } - else if (SAVE.equals(e.getActionCommand())) - { - this.saveToFile(); - } - else if (SELECTION_CHANGED.equals(e.getActionCommand())) - { - this.viewSelectionChanged(); - } } - public void mouseClicked(MouseEvent e) - { + @Override + public void mouseClicked(MouseEvent e) { } - public void mousePressed(MouseEvent e) - { - if (e == null || e.isConsumed()) - { + @Override + public void mousePressed(MouseEvent e) { + if (e == null || e.isConsumed()) { return; } - if (!this.isEnabled()) - { + if (!this.isEnabled()) { return; } - if (e.getButton() == MouseEvent.BUTTON1) - { + if (e.getButton() == MouseEvent.BUTTON1) { this.handleSelect(); } } - public void mouseReleased(MouseEvent e) - { + @Override + public void mouseReleased(MouseEvent e) { } - public void mouseEntered(MouseEvent e) - { + @Override + public void mouseEntered(MouseEvent e) { } - public void mouseExited(MouseEvent e) - { + @Override + public void mouseExited(MouseEvent e) { } - public void airspaceMoved(AirspaceEditEvent e) - { + @Override + public void airspaceMoved(AirspaceEditEvent e) { this.updateShapeIntersection(); } - public void airspaceResized(AirspaceEditEvent e) - { + @Override + public void airspaceResized(AirspaceEditEvent e) { this.updateShapeIntersection(); } - public void controlPointAdded(AirspaceEditEvent e) - { + @Override + public void controlPointAdded(AirspaceEditEvent e) { } - public void controlPointRemoved(AirspaceEditEvent e) - { + @Override + public void controlPointRemoved(AirspaceEditEvent e) { } - public void controlPointChanged(AirspaceEditEvent e) - { + @Override + public void controlPointChanged(AirspaceEditEvent e) { } - protected void handleSelect() - { + protected void handleSelect() { // If the picked object is null or something other than an airspace, then ignore the mouse click. If we // deselect the current entry at this point, the user cannot easily navigate without loosing the selection. PickedObjectList pickedObjects = this.getApp().getWwd().getObjectsAtCurrentPosition(); Object topObject = pickedObjects.getTopObject(); - if (!(topObject instanceof Airspace)) + if (!(topObject instanceof Airspace)) { return; + } AirspaceEntry pickedEntry = this.getEntryFor((Airspace) topObject); - if (pickedEntry == null) + if (pickedEntry == null) { return; + } - if (this.getSelectedEntry() != pickedEntry) - { + if (this.getSelectedEntry() != pickedEntry) { this.selectEntry(pickedEntry, true); } } - protected void handleEnableEdit(boolean enable) - { - if (this.getSelectedEntry() == null) + protected void handleEnableEdit(boolean enable) { + if (this.getSelectedEntry() == null) { return; + } - if (this.isSelectionEditing() != enable) + if (this.isSelectionEditing() != enable) { this.setSelectionEditing(enable); + } } - protected void updateShapeIntersection() - { + protected void updateShapeIntersection() { AirspaceEntry selected = this.getSelectedEntry(); - if (selected != null) - { + if (selected != null) { boolean hasIntersection = false; - for (AirspaceEntry entry : this.getModel().getEntries()) - { - if (entry != selected) - { + for (AirspaceEntry entry : this.getModel().getEntries()) { + if (entry != selected) { boolean intersecting = this.areShapesIntersecting(entry.getAirspace(), selected.getAirspace()); - if (intersecting) + if (intersecting) { hasIntersection = true; + } entry.setIntersecting(intersecting); } } selected.setIntersecting(hasIntersection); - } - else - { - for (AirspaceEntry entry : this.getModel().getEntries()) - { + } else { + for (AirspaceEntry entry : this.getModel().getEntries()) { entry.setIntersecting(false); } } } - protected boolean areShapesIntersecting(Airspace a1, Airspace a2) - { - if ((a1 instanceof SphereAirspace) && (a2 instanceof SphereAirspace)) - { + protected boolean areShapesIntersecting(Airspace a1, Airspace a2) { + if ((a1 instanceof SphereAirspace) && (a2 instanceof SphereAirspace)) { SphereAirspace s1 = (SphereAirspace) a1; SphereAirspace s2 = (SphereAirspace) a2; @@ -947,9 +863,9 @@ protected boolean areShapesIntersecting(Airspace a1, Airspace a2) // We have to compute the 3D coordinates of the sphere's center ourselves here. Vec4 p1 = terrainConforming1 ? this.getSurfacePoint(location1, altitude1) - : this.getPoint(location1, altitude1); + : this.getPoint(location1, altitude1); Vec4 p2 = terrainConforming2 ? this.getSurfacePoint(location2, altitude2) - : this.getPoint(location2, altitude2); + : this.getPoint(location2, altitude2); double r1 = s1.getRadius(); double r2 = s2.getRadius(); @@ -961,40 +877,35 @@ protected boolean areShapesIntersecting(Airspace a1, Airspace a2) return false; } - protected Vec4 getSurfacePoint(LatLon latlon, double elevation) - { + protected Vec4 getSurfacePoint(LatLon latlon, double elevation) { Vec4 point = null; SceneController sc = this.getApp().getWwd().getSceneController(); Globe globe = this.getApp().getWwd().getModel().getGlobe(); - if (sc.getTerrain() != null) - { + if (sc.getTerrain() != null) { point = sc.getTerrain().getSurfacePoint( - latlon.getLatitude(), latlon.getLongitude(), elevation * sc.getVerticalExaggeration()); + latlon.getLatitude(), latlon.getLongitude(), elevation * sc.getVerticalExaggeration()); } - if (point == null) - { + if (point == null) { double e = globe.getElevation(latlon.getLatitude(), latlon.getLongitude()); point = globe.computePointFromPosition( - latlon.getLatitude(), latlon.getLongitude(), (e + elevation) * sc.getVerticalExaggeration()); + latlon.getLatitude(), latlon.getLongitude(), (e + elevation) * sc.getVerticalExaggeration()); } return point; } - protected Vec4 getPoint(LatLon latlon, double elevation) - { + protected Vec4 getPoint(LatLon latlon, double elevation) { SceneController sc = this.getApp().getWwd().getSceneController(); Globe globe = this.getApp().getWwd().getModel().getGlobe(); double e = globe.getElevation(latlon.getLatitude(), latlon.getLongitude()); return globe.computePointFromPosition( - latlon.getLatitude(), latlon.getLongitude(), (e + elevation) * sc.getVerticalExaggeration()); + latlon.getLatitude(), latlon.getLongitude(), (e + elevation) * sc.getVerticalExaggeration()); } - public void createNewEntry(AirspaceFactory factory) - { + public void createNewEntry(AirspaceFactory factory) { Airspace airspace = factory.createAirspace(this.getApp().getWwd(), this.isResizeNewShapesToViewport()); AirspaceEditor editor = factory.createEditor(airspace); AirspaceEntry entry = new AirspaceEntry(airspace, editor); @@ -1004,19 +915,15 @@ public void createNewEntry(AirspaceFactory factory) this.selectEntry(entry, true); } - public void removeEntries(Iterable entries) - { - if (entries != null) - { - for (AirspaceEntry entry : entries) - { + public void removeEntries(Iterable entries) { + if (entries != null) { + for (AirspaceEntry entry : entries) { this.removeEntry(entry); } } } - public void addEntry(AirspaceEntry entry) - { + public void addEntry(AirspaceEntry entry) { entry.getEditor().addEditListener(this); this.getModel().addEntry(entry); this.updateShapeIntersection(); @@ -1025,12 +932,10 @@ public void addEntry(AirspaceEntry entry) this.getApp().getWwd().redraw(); } - public void removeEntry(AirspaceEntry entry) - { + public void removeEntry(AirspaceEntry entry) { entry.getEditor().removeEditListener(this); - if (this.getSelectedEntry() == entry) - { + if (this.getSelectedEntry() == entry) { this.selectEntry(null, true); } @@ -1041,32 +946,24 @@ public void removeEntry(AirspaceEntry entry) this.getApp().getWwd().redraw(); } - public AirspaceEntry getSelectedEntry() - { + public AirspaceEntry getSelectedEntry() { return this.selectedEntry; } - public void selectEntry(AirspaceEntry entry, boolean updateView) - { + public void selectEntry(AirspaceEntry entry, boolean updateView) { this.setSelectedEntry(entry); - if (updateView) - { - if (entry != null) - { + if (updateView) { + if (entry != null) { int index = this.getModel().getIndexForEntry(entry); - this.getView().setSelectedIndices(new int[] {index}); - } - else - { + this.getView().setSelectedIndices(new int[]{index}); + } else { this.getView().setSelectedIndices(new int[0]); } } - if (this.isEnableEdit()) - { - if (this.getSelectedEntry() != null && !this.isSelectionEditing()) - { + if (this.isEnableEdit()) { + if (this.getSelectedEntry() != null && !this.isSelectionEditing()) { this.setSelectionEditing(true); } } @@ -1075,12 +972,9 @@ public void selectEntry(AirspaceEntry entry, boolean updateView) this.getApp().getWwd().redraw(); } - protected void setSelectedEntry(AirspaceEntry entry) - { - if (this.selectedEntry != null) - { - if (this.selectedEntry != entry && this.selectedEntry.isEditing()) - { + protected void setSelectedEntry(AirspaceEntry entry) { + if (this.selectedEntry != null) { + if (this.selectedEntry != entry && this.selectedEntry.isEditing()) { this.setSelectionEditing(false); } @@ -1089,26 +983,21 @@ protected void setSelectedEntry(AirspaceEntry entry) this.selectedEntry = entry; - if (this.selectedEntry != null) - { + if (this.selectedEntry != null) { this.selectedEntry.setSelected(true); } } - protected boolean isSelectionEditing() - { + protected boolean isSelectionEditing() { return this.selectedEntry != null && this.selectedEntry.isEditing(); } - protected void setSelectionEditing(boolean editing) - { - if (this.selectedEntry == null) - { + protected void setSelectionEditing(boolean editing) { + if (this.selectedEntry == null) { throw new IllegalStateException(); } - if (this.selectedEntry.isEditing() == editing) - { + if (this.selectedEntry.isEditing() == editing) { throw new IllegalStateException(); } @@ -1117,13 +1006,10 @@ protected void setSelectionEditing(boolean editing) AirspaceEditor editor = this.selectedEntry.getEditor(); editor.setArmed(editing); - if (editing) - { + if (editing) { this.editorController.setEditor(editor); insertBeforePlacenames(this.getApp().getWwd(), editor); - } - else - { + } else { this.editorController.setEditor(null); this.getApp().getWwd().getModel().getLayers().remove(editor); } @@ -1132,13 +1018,10 @@ protected void setSelectionEditing(boolean editing) this.getModel().fireTableRowsUpdated(index, index); } - protected void viewSelectionChanged() - { + protected void viewSelectionChanged() { int[] indices = this.getView().getSelectedIndices(); - if (indices != null) - { - for (AirspaceEntry entry : this.getEntriesFor(indices)) - { + if (indices != null) { + for (AirspaceEntry entry : this.getEntriesFor(indices)) { this.selectEntry(entry, false); } } @@ -1146,94 +1029,70 @@ protected void viewSelectionChanged() this.getApp().getWwd().redraw(); } - protected AirspaceEntry[] getSelectedEntries() - { + protected AirspaceEntry[] getSelectedEntries() { int[] indices = this.getView().getSelectedIndices(); - if (indices != null) - { + if (indices != null) { return this.getEntriesFor(indices); } return new AirspaceEntry[0]; } - protected AirspaceEntry[] getEntriesFor(int[] indices) - { + protected AirspaceEntry[] getEntriesFor(int[] indices) { AirspaceEntry[] entries = new AirspaceEntry[indices.length]; - for (int i = 0; i < indices.length; i++) - { + for (int i = 0; i < indices.length; i++) { entries[i] = this.getModel().getEntry(indices[i]); } return entries; } - protected AirspaceEntry getEntryFor(Airspace airspace) - { - for (AirspaceEntry entry : this.getModel().getEntries()) - { - if (entry.getAirspace() == airspace) - { + protected AirspaceEntry getEntryFor(Airspace airspace) { + for (AirspaceEntry entry : this.getModel().getEntries()) { + if (entry.getAirspace() == airspace) { return entry; } } return null; } - protected void zoomTo(LatLon latLon, Angle heading, Angle pitch, double zoom) - { + protected void zoomTo(LatLon latLon, Angle heading, Angle pitch, double zoom) { BasicOrbitView view = (BasicOrbitView) this.getApp().getWwd().getView(); view.stopMovement(); view.addPanToAnimator( - new Position(latLon, 0), heading, pitch, zoom, true); + new Position(latLon, 0), heading, pitch, zoom, true); } - protected void openFromURL() - { + protected void openFromURL() { Object input = JOptionPane.showInputDialog(this.getApp(), "Enter a URL: ", "Open Shapes from URL", - JOptionPane.QUESTION_MESSAGE, null, null, null); - if (input == null) + JOptionPane.QUESTION_MESSAGE, null, null, null); + if (input == null) { return; + } URL url = null; - try - { + try { url = new URL(input.toString()); - } - catch (IOException e) - { + } catch (IOException e) { e.printStackTrace(); } - if (url != null) - { + if (url != null) { this.openFromPath(url.toExternalForm()); } } - protected void openFromPath(final String path) - { - Thread t = new Thread(new Runnable() - { - public void run() - { - final ArrayList airspaces = new ArrayList(); - try - { - loadAirspacesFromPath(path, airspaces); - } - finally - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - setAirspaces(airspaces); - setEnabled(true); - getApp().setCursor(null); - getApp().getWwd().redraw(); - } - }); - } + protected void openFromPath(final String path) { + Thread t = new Thread(() -> { + final ArrayList airspaces = new ArrayList<>(); + try { + loadAirspacesFromPath(path, airspaces); + } finally { + SwingUtilities.invokeLater(() -> { + setAirspaces(airspaces); + setEnabled(true); + getApp().setCursor(null); + getApp().getWwd().redraw(); + }); } }); @@ -1242,60 +1101,52 @@ public void run() t.start(); } - protected void loadAirspacesFromPath(String path, Collection airspaces) - { + protected void loadAirspacesFromPath(String path, Collection airspaces) { File file = ExampleUtil.saveResourceToTempFile(path, ".zip"); - if (file == null) + if (file == null) { return; + } - try - { + try { ZipFile zipFile = new ZipFile(file); ZipEntry entry = null; for (Enumeration e = zipFile.entries(); e.hasMoreElements(); - entry = e.nextElement()) - { - if (entry == null) + entry = e.nextElement()) { + if (entry == null) { continue; + } String name = WWIO.getFilename(entry.getName()); - if (!(name.startsWith("gov.nasa.worldwind.render.airspaces") && name.endsWith(".xml"))) + if (!(name.startsWith("gov.nasa.worldwind.render.airspaces") && name.endsWith(".xml"))) { continue; + } String[] tokens = name.split("-"); - try - { - Class c = Class.forName(tokens[0]); - Airspace airspace = (Airspace) c.newInstance(); + try { + Class c = Class.forName(tokens[0]); + Airspace airspace = (Airspace) c.getConstructor().newInstance(); BufferedReader input = new BufferedReader(new InputStreamReader(zipFile.getInputStream(entry))); String s = input.readLine(); airspace.restoreState(s); airspaces.add(airspace); - if (tokens.length >= 2) - { + if (tokens.length >= 2) { airspace.setValue(AVKey.DISPLAY_NAME, tokens[1]); } - } - catch (Exception ex) - { + } catch (Exception ex) { ex.printStackTrace(); } } - } - catch (IOException e) - { + } catch (IOException e) { e.printStackTrace(); } } - protected void openFromFile() - { - if (this.fileChooser == null) - { + protected void openFromFile() { + if (this.fileChooser == null) { this.fileChooser = new JFileChooser(); this.fileChooser.setCurrentDirectory(new File(Configuration.getUserHomeDirectory())); } @@ -1304,64 +1155,44 @@ protected void openFromFile() this.fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); this.fileChooser.setMultiSelectionEnabled(false); int status = this.fileChooser.showOpenDialog(null); - if (status != JFileChooser.APPROVE_OPTION) + if (status != JFileChooser.APPROVE_OPTION) { return; + } final File dir = this.fileChooser.getSelectedFile(); - if (dir == null) + if (dir == null) { return; + } - Thread t = new Thread(new Runnable() - { - public void run() - { - final ArrayList airspaces = new ArrayList(); - try - { - File[] files = dir.listFiles(new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.startsWith("gov.nasa.worldwind.render.airspaces") && name.endsWith(".xml"); - } - }); - - for (File file : files) - { - String[] name = file.getName().split("-"); - try - { - Class c = Class.forName(name[0]); - Airspace airspace = (Airspace) c.newInstance(); - BufferedReader input = new BufferedReader(new FileReader(file)); - String s = input.readLine(); - airspace.restoreState(s); - airspaces.add(airspace); - - if (name.length >= 2) - { - airspace.setValue(AVKey.DISPLAY_NAME, name[1]); - } - } - catch (Exception e) - { - e.printStackTrace(); + Thread t = new Thread(() -> { + final ArrayList airspaces = new ArrayList<>(); + try { + File[] files = dir.listFiles((File dir1, String name) -> name.startsWith("gov.nasa.worldwind.render.airspaces") && name.endsWith(".xml")); + + for (File file : files) { + String[] name = file.getName().split("-"); + try { + Class c = Class.forName(name[0]); + Airspace airspace = (Airspace) c.getConstructor().newInstance(); + BufferedReader input = new BufferedReader(new FileReader(file)); + String s = input.readLine(); + airspace.restoreState(s); + airspaces.add(airspace); + + if (name.length >= 2) { + airspace.setValue(AVKey.DISPLAY_NAME, name[1]); } + } catch (Exception e) { + e.printStackTrace(); } } - finally - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - setAirspaces(airspaces); - setEnabled(true); - getApp().setCursor(null); - getApp().getWwd().redraw(); - } - }); - } + } finally { + SwingUtilities.invokeLater(() -> { + setAirspaces(airspaces); + setEnabled(true); + getApp().setCursor(null); + getApp().getWwd().redraw(); + }); } }); this.setEnabled(false); @@ -1369,10 +1200,8 @@ public void run() t.start(); } - protected void saveToFile() - { - if (this.fileChooser == null) - { + protected void saveToFile() { + if (this.fileChooser == null) { this.fileChooser = new JFileChooser(); this.fileChooser.setCurrentDirectory(new File(Configuration.getUserHomeDirectory())); } @@ -1381,70 +1210,55 @@ protected void saveToFile() this.fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); this.fileChooser.setMultiSelectionEnabled(false); int status = this.fileChooser.showSaveDialog(null); - if (status != JFileChooser.APPROVE_OPTION) + if (status != JFileChooser.APPROVE_OPTION) { return; + } final File dir = this.fileChooser.getSelectedFile(); - if (dir == null) + if (dir == null) { return; + } - if (!dir.exists()) - { + if (!dir.exists()) { //noinspection ResultOfMethodCallIgnored dir.mkdirs(); } final Iterable entries = this.getModel().getEntries(); - Thread t = new Thread(new Runnable() - { - public void run() - { - try - { - java.text.DecimalFormat f = new java.text.DecimalFormat("####"); - f.setMinimumIntegerDigits(4); - int counter = 0; - - for (AirspaceEntry entry : entries) - { - Airspace a = entry.getAirspace(); - AirspaceAttributes currentAttribs = a.getAttributes(); - a.setAttributes(entry.getAttributes()); - - String xmlString = a.getRestorableState(); - if (xmlString != null) - { - try - { - PrintWriter of = new PrintWriter(new File(dir, + Thread t = new Thread(() -> { + try { + java.text.DecimalFormat f = new java.text.DecimalFormat("####"); + f.setMinimumIntegerDigits(4); + int counter = 0; + + for (AirspaceEntry entry : entries) { + Airspace a = entry.getAirspace(); + AirspaceAttributes currentAttribs = a.getAttributes(); + a.setAttributes(entry.getAttributes()); + + String xmlString = a.getRestorableState(); + if (xmlString != null) { + try { + try (PrintWriter of = new PrintWriter(new File(dir, a.getClass().getName() + "-" + entry.getName() + "-" + f.format(counter++) - + ".xml")); + + ".xml"))) { of.write(xmlString); of.flush(); - of.close(); - } - catch (Exception e) - { - e.printStackTrace(); } + } catch (Exception e) { + e.printStackTrace(); } - - a.setAttributes(currentAttribs); } + + a.setAttributes(currentAttribs); } - finally - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - setEnabled(true); - getApp().setCursor(null); - getApp().getWwd().redraw(); - } - }); - } + } finally { + SwingUtilities.invokeLater(() -> { + setEnabled(true); + getApp().setCursor(null); + getApp().getWwd().redraw(); + }); } }); this.setEnabled(false); @@ -1452,13 +1266,11 @@ public void run() t.start(); } - protected void setAirspaces(Iterable airspaces) - { - ArrayList entryList = new ArrayList(this.getModel().getEntries()); + protected void setAirspaces(Iterable airspaces) { + ArrayList entryList = new ArrayList<>(this.getModel().getEntries()); this.removeEntries(entryList); - for (Airspace airspace : airspaces) - { + for (Airspace airspace : airspaces) { airspace.setAttributes(getDefaultAttributes()); AirspaceEntry entry = new AirspaceEntry(airspace, getEditorFor(airspace)); this.addEntry(entry); @@ -1469,17 +1281,15 @@ protected void setAirspaces(Iterable airspaces) //**************************************************************// //******************** Main **********************************// //**************************************************************// + protected static class AppFrame extends ApplicationTemplate.AppFrame { - protected static class AppFrame extends ApplicationTemplate.AppFrame - { // Airspace layer and editor UI components. protected RenderableLayer airspaceLayer; protected AirspaceBuilderModel builderModel; protected AirspaceBuilderPanel builderView; protected AirspaceBuilderController builderController; - public AppFrame() - { + public AppFrame() { this.airspaceLayer = new RenderableLayer(); this.airspaceLayer.setName(AIRSPACE_LAYER_NAME); insertBeforePlacenames(this.getWwd(), this.airspaceLayer); @@ -1496,18 +1306,15 @@ public AppFrame() makeMenuBar(this, this.builderController); } - public AirspaceBuilderPanel getAirspaceBuilderPanel() - { + public AirspaceBuilderPanel getAirspaceBuilderPanel() { return this.builderView; } - public RenderableLayer getAirspaceLayer() - { + public RenderableLayer getAirspaceLayer() { return this.airspaceLayer; } - public static void makeMenuBar(JFrame frame, final AirspaceBuilderController controller) - { + public static void makeMenuBar(JFrame frame, final AirspaceBuilderController controller) { JMenuBar menuBar = new JMenuBar(); final JCheckBoxMenuItem resizeNewShapesItem; final JCheckBoxMenuItem enableEditItem; @@ -1516,7 +1323,7 @@ public static void makeMenuBar(JFrame frame, final AirspaceBuilderController con { JMenuItem item = new JMenuItem("Open..."); item.setAccelerator(KeyStroke.getKeyStroke( - KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); + KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx())); item.setActionCommand(OPEN); item.addActionListener(controller); menu.add(item); @@ -1528,7 +1335,7 @@ public static void makeMenuBar(JFrame frame, final AirspaceBuilderController con item = new JMenuItem("Save..."); item.setAccelerator(KeyStroke.getKeyStroke( - KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); + KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx())); item.setActionCommand(SAVE); item.addActionListener(controller); menu.add(item); @@ -1545,15 +1352,10 @@ public static void makeMenuBar(JFrame frame, final AirspaceBuilderController con menu = new JMenu("Shape"); { JMenu subMenu = new JMenu("New"); - for (final AirspaceFactory factory : defaultAirspaceFactories) - { + for (final AirspaceFactory factory : defaultAirspaceFactories) { JMenuItem item = new JMenuItem(factory.toString()); - item.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - controller.createNewEntry(factory); - } + item.addActionListener((ActionEvent e) -> { + controller.createNewEntry(factory); }); subMenu.add(item); } @@ -1577,7 +1379,7 @@ public void actionPerformed(ActionEvent e) { JMenuItem item = new JMenuItem("Deselect"); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx())); item.setActionCommand(CLEAR_SELECTION); item.addActionListener(controller); menu.add(item); @@ -1592,25 +1394,17 @@ public void actionPerformed(ActionEvent e) frame.setJMenuBar(menuBar); - controller.addPropertyChangeListener(new PropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent e) - { - if (SIZE_NEW_SHAPES_TO_VIEWPORT.equals((e.getPropertyName()))) - { - resizeNewShapesItem.setSelected(controller.isResizeNewShapesToViewport()); - } - else if (ENABLE_EDIT.equals(e.getPropertyName())) - { - enableEditItem.setSelected(controller.isEnableEdit()); - } + controller.addPropertyChangeListener((PropertyChangeEvent e) -> { + if (SIZE_NEW_SHAPES_TO_VIEWPORT.equals((e.getPropertyName()))) { + resizeNewShapesItem.setSelected(controller.isResizeNewShapesToViewport()); + } else if (ENABLE_EDIT.equals(e.getPropertyName())) { + enableEditItem.setSelected(controller.isEnableEdit()); } }); } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Airspace Builder", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Airspace Builder", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Airspaces.java b/src/gov/nasa/worldwindx/examples/Airspaces.java index 7708edabfd..ab63fd079f 100644 --- a/src/gov/nasa/worldwindx/examples/Airspaces.java +++ b/src/gov/nasa/worldwindx/examples/Airspaces.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -16,11 +38,11 @@ import java.util.Arrays; /** - * Illustrates how to configure and display World Wind {@link Airspace} shapes. Airspace shapes are + * Illustrates how to configure and display WorldWind {@link Airspace} shapes. Airspace shapes are * extruded 3D volumes defined by geographic coordinates and upper- and lower- altitude boundaries. The interior of * airspace shapes always conforms to the curvature of the globe, and optionally also conform to the underlying * terrain. - *

            + *

            * This shows how to use all 11 types of standard airspace shapes:

            • {@link Orbit} - a rectangle * with rounded end caps.
            • {@link Curtain} - a vertically extruded wall.
            • {@link * Polygon} - a vertically extruded polygon.
            • {@link PolyArc} - a vertically extruded @@ -445,7 +467,7 @@ public void initializeSelectionMonitoring() public static void main(String[] args) { - start("World Wind Airspaces", AppFrame.class); + start("WorldWind Airspaces", AppFrame.class); } protected static Iterable makeLatLon(double[] src) diff --git a/src/gov/nasa/worldwindx/examples/AlarmIcons.java b/src/gov/nasa/worldwindx/examples/AlarmIcons.java index 1ff0d357ff..a97a10adbc 100644 --- a/src/gov/nasa/worldwindx/examples/AlarmIcons.java +++ b/src/gov/nasa/worldwindx/examples/AlarmIcons.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -17,10 +39,10 @@ import java.util.ArrayList; /** - * Illustrates how to display an icon with an alarm state using a World Wind {@link WWIcon}. This applies a + * Illustrates how to display an icon with an alarm state using a WorldWind {@link WWIcon}. This applies a * background image to an icon indicating a warning or an urgent condition, then varies the background image's scale * factor over time to make it flash or pulse. - *

              + *

              * This applies the background image by calling {@link WWIcon#setBackgroundImage(Object)}, and varies its * scale factor by calling {@link WWIcon#setBackgroundScale(double)}. * @@ -184,6 +206,6 @@ private FlashingAlarmAction(String name, Object bgp, int frequency) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Alarm Icons", AppFrame.class); + ApplicationTemplate.start("WorldWind Alarm Icons", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java b/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java index 719d984fed..e368d5cd6f 100644 --- a/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java +++ b/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -11,10 +33,10 @@ import gov.nasa.worldwind.event.*; import gov.nasa.worldwind.geom.*; -import javax.media.opengl.GLAnimatorControl; +import com.jogamp.opengl.GLAnimatorControl; /** - * Shows how to use a JOGL Animator to animate in World Wind + * Shows how to use a JOGL Animator to animate in WorldWind * * @author tag * @version $Id: AnimatedGlobe.java 1893 2014-04-04 04:31:59Z tgaskins $ @@ -70,6 +92,6 @@ public void stageChanged(RenderingEvent event) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Animated Globe", AppFrame.class); + ApplicationTemplate.start("WorldWind Animated Globe", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/AnnotationControls.java b/src/gov/nasa/worldwindx/examples/AnnotationControls.java index 2679021635..125f458bd9 100644 --- a/src/gov/nasa/worldwindx/examples/AnnotationControls.java +++ b/src/gov/nasa/worldwindx/examples/AnnotationControls.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -20,7 +42,7 @@ import java.io.InputStream; /** - * Illustrates how to use a World Wind {@link Annotation} with an {@link + * Illustrates how to use a WorldWind {@link Annotation} with an {@link * AnnotationLayoutManager} to display an Annotation with a simple embedded user interface. The custom Annotation * layouts illustrated here can be found in the following example classes:

              • {@link * AudioPlayerAnnotation}
              • {@link SlideShowAnnotation}
              @@ -655,6 +677,6 @@ public static String createTitle(Iterable sources) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Annotation Controls", AppFrame.class); + ApplicationTemplate.start("WorldWind Annotation Controls", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Annotations.java b/src/gov/nasa/worldwindx/examples/Annotations.java index ee6dba785c..cd0e8972dc 100644 --- a/src/gov/nasa/worldwindx/examples/Annotations.java +++ b/src/gov/nasa/worldwindx/examples/Annotations.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -15,7 +37,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwindx.examples.util.PowerOfTwoPaddedImage; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.*; import javax.swing.Box; import javax.swing.border.*; @@ -26,7 +48,7 @@ import java.net.URL; /** - * Illustrates how to use a World Wind {@link Annotation} to display on-screen information to the user in + * Illustrates how to use a WorldWind {@link Annotation} to display on-screen information to the user in * the form of a text label with an optional image. Annotations may be attached to a geographic position or a point on * the screen. They provide support for multi-line text, simple HTML text markup, and many styling attributes such as * font face, size and colors, background shape and background image. @@ -1885,6 +1907,6 @@ private Position computeGroundPosition(WorldWindow wwd) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Annotations", AppFrame.class); + ApplicationTemplate.start("WorldWind Annotations", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ApplicationTemplate.java b/src/gov/nasa/worldwindx/examples/ApplicationTemplate.java index 12aa759308..8864440e20 100644 --- a/src/gov/nasa/worldwindx/examples/ApplicationTemplate.java +++ b/src/gov/nasa/worldwindx/examples/ApplicationTemplate.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -24,17 +46,16 @@ * * @version $Id: ApplicationTemplate.java 2115 2014-07-01 17:58:16Z tgaskins $ */ -public class ApplicationTemplate -{ - public static class AppPanel extends JPanel - { +public class ApplicationTemplate { + + public static class AppPanel extends JPanel { + protected WorldWindow wwd; protected StatusBar statusBar; protected ToolTipController toolTipController; protected HighlightController highlightController; - public AppPanel(Dimension canvasSize, boolean includeStatusBar) - { + public AppPanel(Dimension canvasSize, boolean includeStatusBar) { super(new BorderLayout()); this.wwd = this.createWorldWindow(); @@ -48,8 +69,7 @@ public AppPanel(Dimension canvasSize, boolean includeStatusBar) this.wwd.addSelectListener(new ClickAndGoSelectListener(this.getWwd(), WorldMapLayer.class)); this.add((Component) this.wwd, BorderLayout.CENTER); - if (includeStatusBar) - { + if (includeStatusBar) { this.statusBar = new StatusBar(); this.add(statusBar, BorderLayout.PAGE_END); this.statusBar.setEventSource(wwd); @@ -60,24 +80,21 @@ public AppPanel(Dimension canvasSize, boolean includeStatusBar) this.highlightController = new HighlightController(this.getWwd(), SelectEvent.ROLLOVER); } - protected WorldWindow createWorldWindow() - { + protected WorldWindow createWorldWindow() { return new WorldWindowGLCanvas(); } - public WorldWindow getWwd() - { + public WorldWindow getWwd() { return wwd; } - public StatusBar getStatusBar() - { + public StatusBar getStatusBar() { return statusBar; } } - protected static class AppFrame extends JFrame - { + protected static class AppFrame extends JFrame { + private Dimension canvasSize = new Dimension(1000, 800); protected AppPanel wwjPanel; @@ -85,32 +102,27 @@ protected static class AppFrame extends JFrame protected LayerPanel layerPanel; protected StatisticsPanel statsPanel; - public AppFrame() - { + public AppFrame() { this.initialize(true, true, false); } - public AppFrame(Dimension size) - { + public AppFrame(Dimension size) { this.canvasSize = size; this.initialize(true, true, false); } - public AppFrame(boolean includeStatusBar, boolean includeLayerPanel, boolean includeStatsPanel) - { + public AppFrame(boolean includeStatusBar, boolean includeLayerPanel, boolean includeStatsPanel) { this.initialize(includeStatusBar, includeLayerPanel, includeStatsPanel); } - protected void initialize(boolean includeStatusBar, boolean includeLayerPanel, boolean includeStatsPanel) - { + protected void initialize(boolean includeStatusBar, boolean includeLayerPanel, boolean includeStatsPanel) { // Create the WorldWindow. this.wwjPanel = this.createAppPanel(this.canvasSize, includeStatusBar); this.wwjPanel.setPreferredSize(canvasSize); // Put the pieces together. this.getContentPane().add(wwjPanel, BorderLayout.CENTER); - if (includeLayerPanel) - { + if (includeLayerPanel) { this.controlPanel = new JPanel(new BorderLayout(10, 10)); this.layerPanel = new LayerPanel(this.getWwd()); this.controlPanel.add(this.layerPanel, BorderLayout.CENTER); @@ -118,42 +130,34 @@ protected void initialize(boolean includeStatusBar, boolean includeLayerPanel, b this.getContentPane().add(this.controlPanel, BorderLayout.WEST); } - if (includeStatsPanel || System.getProperty("gov.nasa.worldwind.showStatistics") != null) - { + if (includeStatsPanel || System.getProperty("gov.nasa.worldwind.showStatistics") != null) { this.statsPanel = new StatisticsPanel(this.wwjPanel.getWwd(), new Dimension(250, canvasSize.height)); this.getContentPane().add(this.statsPanel, BorderLayout.EAST); } - // Create and install the view controls layer and register a controller for it with the World Window. + // Create and install the view controls layer and register a controller for it with the WorldWindow. ViewControlsLayer viewControlsLayer = new ViewControlsLayer(); insertBeforeCompass(getWwd(), viewControlsLayer); this.getWwd().addSelectListener(new ViewControlsSelectListener(this.getWwd(), viewControlsLayer)); // Register a rendering exception listener that's notified when exceptions occur during rendering. - this.wwjPanel.getWwd().addRenderingExceptionListener(new RenderingExceptionListener() - { - public void exceptionThrown(Throwable t) - { - if (t instanceof WWAbsentRequirementException) - { - String message = "Computer does not meet minimum graphics requirements.\n"; - message += "Please install up-to-date graphics driver and try again.\n"; - message += "Reason: " + t.getMessage() + "\n"; - message += "This program will end when you press OK."; - - JOptionPane.showMessageDialog(AppFrame.this, message, "Unable to Start Program", + this.wwjPanel.getWwd().addRenderingExceptionListener((Throwable t) -> { + if (t instanceof WWAbsentRequirementException) { + String message = "Computer does not meet minimum graphics requirements.\n"; + message += "Please install up-to-date graphics driver and try again.\n"; + message += "Reason: " + t.getMessage() + "\n"; + message += "This program will end when you press OK."; + + JOptionPane.showMessageDialog(AppFrame.this, message, "Unable to Start Program", JOptionPane.ERROR_MESSAGE); - System.exit(-1); - } + System.exit(-1); } }); // 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.wwjPanel.getWwd().getModel().getLayers()) - { - if (layer instanceof SelectListener) - { + for (Layer layer : this.wwjPanel.getWwd().getModel().getLayers()) { + if (layer instanceof SelectListener) { this.getWwd().addSelectListener((SelectListener) layer); } } @@ -165,28 +169,23 @@ public void exceptionThrown(Throwable t) this.setResizable(true); } - protected AppPanel createAppPanel(Dimension canvasSize, boolean includeStatusBar) - { + protected AppPanel createAppPanel(Dimension canvasSize, boolean includeStatusBar) { return new AppPanel(canvasSize, includeStatusBar); } - public Dimension getCanvasSize() - { + public Dimension getCanvasSize() { return canvasSize; } - public AppPanel getWwjPanel() - { + public AppPanel getWwjPanel() { return wwjPanel; } - public WorldWindow getWwd() - { + public WorldWindow getWwd() { return this.wwjPanel.getWwd(); } - public StatusBar getStatusBar() - { + public StatusBar getStatusBar() { return this.wwjPanel.getStatusBar(); } @@ -194,86 +193,78 @@ public StatusBar getStatusBar() * @deprecated Use getControlPanel instead. * @return This application's layer panel. */ - public LayerPanel getLayerPanel() - { + @Deprecated + public LayerPanel getLayerPanel() { return this.layerPanel; } - public JPanel getControlPanel() - { + public JPanel getControlPanel() { return this.controlPanel; } - public StatisticsPanel getStatsPanel() - { + public StatisticsPanel getStatsPanel() { return statsPanel; } - public void setToolTipController(ToolTipController controller) - { - if (this.wwjPanel.toolTipController != null) + public void setToolTipController(ToolTipController controller) { + if (this.wwjPanel.toolTipController != null) { this.wwjPanel.toolTipController.dispose(); + } this.wwjPanel.toolTipController = controller; } - public void setHighlightController(HighlightController controller) - { - if (this.wwjPanel.highlightController != null) + public void setHighlightController(HighlightController controller) { + if (this.wwjPanel.highlightController != null) { this.wwjPanel.highlightController.dispose(); + } this.wwjPanel.highlightController = controller; } } - public static void insertBeforeCompass(WorldWindow wwd, Layer layer) - { + public static void insertBeforeCompass(WorldWindow wwd, Layer layer) { // Insert the layer into the layer list just before the compass. int compassPosition = 0; LayerList layers = wwd.getModel().getLayers(); - for (Layer l : layers) - { - if (l instanceof CompassLayer) + for (Layer l : layers) { + if (l instanceof CompassLayer) { compassPosition = layers.indexOf(l); + } } layers.add(compassPosition, layer); } - public static void insertBeforePlacenames(WorldWindow wwd, Layer layer) - { + public static void insertBeforePlacenames(WorldWindow wwd, Layer layer) { // Insert the layer into the layer list just before the placenames. int compassPosition = 0; LayerList layers = wwd.getModel().getLayers(); - for (Layer l : layers) - { - if (l instanceof PlaceNameLayer) + for (Layer l : layers) { + if (l instanceof PlaceNameLayer) { compassPosition = layers.indexOf(l); + } } layers.add(compassPosition, layer); } - public static void insertAfterPlacenames(WorldWindow wwd, Layer layer) - { + public static void insertAfterPlacenames(WorldWindow wwd, Layer layer) { // Insert the layer into the layer list just after the placenames. int compassPosition = 0; LayerList layers = wwd.getModel().getLayers(); - for (Layer l : layers) - { - if (l instanceof PlaceNameLayer) + for (Layer l : layers) { + if (l instanceof PlaceNameLayer) { compassPosition = layers.indexOf(l); + } } layers.add(compassPosition + 1, layer); } - public static void insertBeforeLayerName(WorldWindow wwd, Layer layer, String targetName) - { + public static void insertBeforeLayerName(WorldWindow wwd, Layer layer, String targetName) { // Insert the layer into the layer list just before the target layer. int targetPosition = 0; LayerList layers = wwd.getModel().getLayers(); - for (Layer l : layers) - { - if (l.getName().indexOf(targetName) != -1) - { + for (Layer l : layers) { + if (l.getName().contains(targetName)) { targetPosition = layers.indexOf(l); break; } @@ -281,55 +272,41 @@ public static void insertBeforeLayerName(WorldWindow wwd, Layer layer, String ta layers.add(targetPosition, layer); } - static - { + static { System.setProperty("java.net.useSystemProxies", "true"); - if (Configuration.isMacOS()) - { + if (Configuration.isMacOS()) { System.setProperty("apple.laf.useScreenMenuBar", "true"); - System.setProperty("com.apple.mrj.application.apple.menu.about.name", "World Wind Application"); + System.setProperty("com.apple.mrj.application.apple.menu.about.name", "WorldWind Application"); System.setProperty("com.apple.mrj.application.growbox.intrudes", "false"); System.setProperty("apple.awt.brushMetalLook", "true"); - } - else if (Configuration.isWindowsOS()) - { + } else if (Configuration.isWindowsOS()) { System.setProperty("sun.awt.noerasebackground", "true"); // prevents flashing during window resizing } } - public static AppFrame start(String appName, Class appFrameClass) - { - if (Configuration.isMacOS() && appName != null) - { + public static AppFrame start(String appName, Class appFrameClass) { + if (Configuration.isMacOS() && appName != null) { System.setProperty("com.apple.mrj.application.apple.menu.about.name", appName); } - try - { - final AppFrame frame = (AppFrame) appFrameClass.newInstance(); + try { + final AppFrame frame = (AppFrame) appFrameClass.getConstructor().newInstance(); frame.setTitle(appName); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - java.awt.EventQueue.invokeLater(new Runnable() - { - public void run() - { - frame.setVisible(true); - } + java.awt.EventQueue.invokeLater(() -> { + frame.setVisible(true); }); return frame; - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); return null; } } - public static void main(String[] args) - { + public static void main(String[] args) { // Call the static start method like this from the main method of your derived class. // Substitute your application's name for the first argument. - ApplicationTemplate.start("World Wind Application", AppFrame.class); + ApplicationTemplate.start("WorldWind Application", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Balloons.java b/src/gov/nasa/worldwindx/examples/Balloons.java index 5de434fb16..6d99e86084 100644 --- a/src/gov/nasa/worldwindx/examples/Balloons.java +++ b/src/gov/nasa/worldwindx/examples/Balloons.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -17,25 +39,25 @@ import java.io.InputStream; /** - * Illustrates how to use a World Wind {@link Balloon} to display on-screen information to the user in the + * Illustrates how to use a WorldWind {@link Balloon} to display on-screen information to the user in the * form of a screen-aligned text balloon. There are two abstract balloon types: {@link ScreenBalloon} which * displays a balloon at a point on the screen, and {@link GlobeBalloon} which displays a balloon attached * to a position on the Globe. For each abstract balloon type, there are two concrete types: AnnotationBalloon which * provides support for simple text content with an optional image, and BrowserBalloon which provides support for * complex HTML, JavaScript, and Flash content. - *

              - * Balloon Content
              A Balloon's content is specified by calling {@link + *

              + * Balloon Content
              A Balloon's content is specified by calling {@link * Balloon#setText(String)}, and its visual attributes are specified by calling {@link * Balloon#setAttributes(gov.nasa.worldwind.render.BalloonAttributes)} with an instance of {@link * BalloonAttributes}. - *

              - * ScreenBalloon
              ScreenBalloons display a screen-aligned balloon at a point on the screen. There + *

              + * ScreenBalloon
              ScreenBalloons display a screen-aligned balloon at a point on the screen. There * are two concrete ScreenBalloon types:

              • {@link ScreenAnnotationBalloon} - a screen-attached * balloon with support for multi-line text, a background image, simple HTML text markup, and simple text styling * attributes.
              • {@link ScreenBrowserBalloon} - a screen-attached balloon with support for HTML, * JavaScript, and Flash content.
              - *

              - * GlobeBalloon
              GlobeBalloons display a screen-aligned balloon attached to a position on the + *

              + * GlobeBalloon
              GlobeBalloons display a screen-aligned balloon attached to a position on the * Globe.

              • {@link GlobeAnnotationBalloon} - a Globe-attached balloon with support for multi-line * text, a background image, simple HTML text markup, and simple text styling attributes.
              • {@link * GlobeBrowserBalloon} - a Globe-attached balloon with support for HTML, JavaScript, and Flash content.
              • @@ -44,19 +66,18 @@ * @author pabercrombie * @version $Id: Balloons.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class Balloons extends ApplicationTemplate -{ +public class Balloons extends ApplicationTemplate { + protected static final String BROWSER_BALLOON_CONTENT_PATH - = "gov/nasa/worldwindx/examples/data/BrowserBalloonExample.html"; + = "gov/nasa/worldwindx/examples/data/BrowserBalloonExample.html"; + + public static class AppFrame extends ApplicationTemplate.AppFrame { - public static class AppFrame extends ApplicationTemplate.AppFrame - { protected HotSpotController hotSpotController; protected BalloonController balloonController; protected RenderableLayer layer; - public AppFrame() - { + public AppFrame() { super(true, true, false); // Add a controller to send input events to BrowserBalloons. @@ -73,7 +94,7 @@ public AppFrame() this.makeAnnotationBalloon(); this.makeBrowserBalloon(); - // Size the World Window to provide enough screen space for the BrowserBalloon, and center the World Window + // Size the WorldWindow to provide enough screen space for the BrowserBalloon, and center the WorldWindow // on the screen. Dimension size = new Dimension(1200, 800); this.setPreferredSize(size); @@ -81,10 +102,9 @@ public AppFrame() WWUtil.alignComponent(null, this, AVKey.CENTER); } - protected void makeAnnotationBalloon() - { + protected void makeAnnotationBalloon() { Balloon balloon = new ScreenAnnotationBalloon("AnnotationBalloon attached to the screen", - new Point(50, 300)); + new Point(50, 300)); BalloonAttributes attrs = new BasicBalloonAttributes(); // Size the balloon to fit its text, place its lower-left corner at the point, put event padding between the @@ -103,28 +123,24 @@ protected void makeAnnotationBalloon() this.layer.addRenderable(balloon); } - protected void makeBrowserBalloon() - { + @Deprecated + protected void makeBrowserBalloon() { String htmlString = null; InputStream contentStream = null; - try - { + try { // Read the URL content into a String using the default encoding (UTF-8). contentStream = WWIO.openFileOrResourceStream(BROWSER_BALLOON_CONTENT_PATH, this.getClass()); htmlString = WWIO.readStreamToString(contentStream, null); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); - } - finally - { + } finally { WWIO.closeStream(contentStream, BROWSER_BALLOON_CONTENT_PATH); } - if (htmlString == null) + if (htmlString == null) { htmlString = Logging.getMessage("generic.ExceptionAttemptingToReadFile", BROWSER_BALLOON_CONTENT_PATH); + } Position balloonPosition = Position.fromDegrees(38.883056, -77.016389); @@ -148,14 +164,13 @@ protected void makeBrowserBalloon() } } - public static void main(String[] args) - { + public static void main(String[] args) { // Configure the initial view parameters so that the browser balloon is centered in the viewport. Configuration.setValue(AVKey.INITIAL_LATITUDE, 60); Configuration.setValue(AVKey.INITIAL_LONGITUDE, -85); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 9500000); Configuration.setValue(AVKey.INITIAL_PITCH, 45); - ApplicationTemplate.start("World Wind Balloons", AppFrame.class); + ApplicationTemplate.start("WorldWind Balloons", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/BathymetryRemoval.java b/src/gov/nasa/worldwindx/examples/BathymetryRemoval.java index 6cfd99d9fd..31373ed224 100644 --- a/src/gov/nasa/worldwindx/examples/BathymetryRemoval.java +++ b/src/gov/nasa/worldwindx/examples/BathymetryRemoval.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.terrain.BathymetryFilterElevationModel; /** - * Illustrates how to suppress the World Wind {@link gov.nasa.worldwind.globes.Globe}'s bathymetry + * Illustrates how to suppress the WorldWind {@link gov.nasa.worldwind.globes.Globe}'s bathymetry * (elevations below mean sea level) by using a {@link BathymetryFilterElevationModel}. * * @author tag @@ -37,6 +59,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Bathymetry Removal", AppFrame.class); + ApplicationTemplate.start("WorldWind Bathymetry Removal", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Boxes.java b/src/gov/nasa/worldwindx/examples/Boxes.java index 69a099456e..0ac3ec8faa 100644 --- a/src/gov/nasa/worldwindx/examples/Boxes.java +++ b/src/gov/nasa/worldwindx/examples/Boxes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -13,7 +35,7 @@ import gov.nasa.worldwind.render.Box; /** - * Illustrates how to use the World Wind {@link Box} rigid shape to display an arbitrarily sized and + * Illustrates how to use the WorldWind {@link Box} rigid shape to display an arbitrarily sized and * oriented box at a geographic position on the Globe. * * @author ccrick @@ -133,6 +155,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Boxes", AppFrame.class); + ApplicationTemplate.start("WorldWind Boxes", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/BulkDownload.java b/src/gov/nasa/worldwindx/examples/BulkDownload.java index ec3feeebee..bb1f97bbd7 100644 --- a/src/gov/nasa/worldwindx/examples/BulkDownload.java +++ b/src/gov/nasa/worldwindx/examples/BulkDownload.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -11,7 +33,7 @@ import java.awt.*; /** - * Illustrates how to use World Wind to retrieve data from layers and elevation models in bulk from a remote source. + * Illustrates how to use WorldWind to retrieve data from layers and elevation models in bulk from a remote source. * This class uses a {@link gov.nasa.worldwindx.examples.util.SectorSelector} to specify the geographic area * to retrieve, then retrieves data for the specified area using the {@link gov.nasa.worldwind.retrieve.BulkRetrievable} * interface on layers and elevation models that support it. @@ -28,7 +50,7 @@ public AppFrame() // Add the bulk download control panel. this.getControlPanel().add(new BulkDownloadPanel(this.getWwd()), BorderLayout.SOUTH); - // Size the application window to provide enough screen space for the World Window and the bulk download + // Size the application window to provide enough screen space for the WorldWindow and the bulk download // panel, then center the application window on the screen. Dimension size = new Dimension(1200, 800); this.setPreferredSize(size); @@ -39,6 +61,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Bulk Download", AppFrame.class); + ApplicationTemplate.start("WorldWind Bulk Download", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/BulkDownloadPanel.java b/src/gov/nasa/worldwindx/examples/BulkDownloadPanel.java index e22038e234..ed2a6c4a5c 100644 --- a/src/gov/nasa/worldwindx/examples/BulkDownloadPanel.java +++ b/src/gov/nasa/worldwindx/examples/BulkDownloadPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/CacheLocationConfiguration.java b/src/gov/nasa/worldwindx/examples/CacheLocationConfiguration.java index d0656dc905..61ee606b95 100644 --- a/src/gov/nasa/worldwindx/examples/CacheLocationConfiguration.java +++ b/src/gov/nasa/worldwindx/examples/CacheLocationConfiguration.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -9,9 +31,9 @@ import gov.nasa.worldwind.Configuration; /** - * Illustrates how to specify a configuration file that specifies alternate locations for the World Wind local cache. + * Illustrates how to specify a configuration file that specifies alternate locations for the WorldWind local cache. * This example works in conjunction with the companion file CacheLocationConfiguration.xml, which specifies a - * non-default location for the writable World Wind cache. That file also includes the standard read locations of the + * non-default location for the writable WorldWind cache. That file also includes the standard read locations of the * cache so that any previously cached data will be found and used. * * @author tag @@ -21,11 +43,11 @@ public class CacheLocationConfiguration extends ApplicationTemplate { public static void main(String[] args) { - // Prior to starting World Wind, specify the cache configuration file to Configuration. + // Prior to starting WorldWind, specify the cache configuration file to Configuration. Configuration.setValue( "gov.nasa.worldwind.avkey.DataFileStoreConfigurationFileName", "gov/nasa/worldwindx/examples/data/CacheLocationConfiguration.xml"); - ApplicationTemplate.start("World Wind Cache Configuration", AppFrame.class); + ApplicationTemplate.start("WorldWind Cache Configuration", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ClickAndGoSelectListener.java b/src/gov/nasa/worldwindx/examples/ClickAndGoSelectListener.java index ee1fc4a59f..baf0504337 100644 --- a/src/gov/nasa/worldwindx/examples/ClickAndGoSelectListener.java +++ b/src/gov/nasa/worldwindx/examples/ClickAndGoSelectListener.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/Cones.java b/src/gov/nasa/worldwindx/examples/Cones.java index 6726748a7f..f1ce02e653 100644 --- a/src/gov/nasa/worldwindx/examples/Cones.java +++ b/src/gov/nasa/worldwindx/examples/Cones.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -18,7 +40,7 @@ import java.util.Hashtable; /** - * Illustrates how to use the World Wind {@link Cone} rigid shape to display an arbitrarily sized and + * Illustrates how to use the WorldWind {@link Cone} rigid shape to display an arbitrarily sized and * oriented cone at a geographic position on the Globe. * * @author ccrick @@ -205,7 +227,7 @@ protected void setConeDetailHint(double hint) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Cones", AppFrame.class); + ApplicationTemplate.start("WorldWind Cones", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java b/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java index e5f4244429..b69b9679ab 100644 --- a/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java +++ b/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -10,13 +32,13 @@ import gov.nasa.worldwind.render.GLRuntimeCapabilities; import gov.nasa.worldwind.util.Logging; -import javax.media.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLAutoDrawable; /** - * Illustrates how to specify the OpenGL features World Wind uses by configuring a {@link + * Illustrates how to specify the OpenGL features WorldWind uses by configuring a {@link * GLRuntimeCapabilities}. By defining a custom {@link gov.nasa.worldwind.WorldWindowGLDrawable} and * setting properties on the GLRuntimeCapabilities attached to its SceneController, applications can specify which - * OpenGL features World Wind uses during rendering. + * OpenGL features WorldWind uses during rendering. * * @author dcollins * @version $Id: ConfiguringGLRuntimeCapabilities.java 3432 2015-10-01 19:40:30Z dcollins $ @@ -26,7 +48,7 @@ public class ConfiguringGLRuntimeCapabilities extends ApplicationTemplate static { // Modify the configuration to specify our custom WorldWindowGLDrawable. Normally, an application would specify - // this in a configuration file. For example, via the standard World Wind XML configuration file: + // this in a configuration file. For example, via the standard WorldWind XML configuration file: // // // ... @@ -34,7 +56,7 @@ public class ConfiguringGLRuntimeCapabilities extends ApplicationTemplate // ... // // - // Or via the legacy World Wind properties file: + // Or via the legacy WorldWind properties file: // // ... // gov.nasa.worldwind.avkey.WorldWindowClassName=MyGLAutoDrawableClassName @@ -46,8 +68,8 @@ public class ConfiguringGLRuntimeCapabilities extends ApplicationTemplate /** * Subclass of {@link gov.nasa.worldwind.WorldWindowGLAutoDrawable} which overrides the method {@link - * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(javax.media.opengl.GLAutoDrawable)} to configure the OpenGL - * features used by the World Wind SDK. + * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(com.jogamp.opengl.GLAutoDrawable)} to configure the OpenGL + * features used by the WorldWind SDK. */ public static class MyGLAutoDrawable extends WorldWindowGLAutoDrawable { @@ -57,20 +79,20 @@ public MyGLAutoDrawable() } /** - * Overridden to configure the OpenGL features used by the World Wind SDK. See {@link - * javax.media.opengl.GLEventListener#init(GLAutoDrawable)}. + * Overridden to configure the OpenGL features used by the WorldWind SDK. See {@link + * com.jogamp.opengl.GLEventListener#init(GLAutoDrawable)}. * * @param glAutoDrawable the drawable */ public void init(GLAutoDrawable glAutoDrawable) { // Invoked when the GL context changes. The host machine capabilities may have changed, so re-configure the - // OpenGL features used by the World Wind SDK. + // OpenGL features used by the WorldWind SDK. super.init(glAutoDrawable); this.configureGLRuntimeCaps(); } - /** Configures the OpenGL runtime features used by the World Wind SDK. */ + /** Configures the OpenGL runtime features used by the WorldWind SDK. */ protected void configureGLRuntimeCaps() { // Get a reference to the OpenGL Runtime Capabilities associated with this WorldWindow's SceneController. @@ -90,14 +112,14 @@ protected void configureGLRuntimeCaps() return; } - // Configure which OpenGL features may be used by the World Wind SDK. Configuration values for features + // Configure which OpenGL features may be used by the WorldWind SDK. Configuration values for features // which are not available on the host machine are ignored. This example shows configuration of the OpenGL // framebuffer objects feature. glrc.setFramebufferObjectEnabled(this.isEnableFramebufferObjects()); } /** - * Returns true if the World Wind SDK should enable use of OpenGL framebuffer objects (if available), and false + * Returns true if the WorldWind SDK should enable use of OpenGL framebuffer objects (if available), and false * otherwise. * * @return true ot enable use of GL framebuffer objects; false otherwise. @@ -105,7 +127,7 @@ protected void configureGLRuntimeCaps() protected boolean isEnableFramebufferObjects() { // Applications inject their logic for determining whether or not to enable use of OpenGL framebuffer - // objects in the World Wind SDK. If OpenGL framebuffer objects are not available on the host machine, + // objects in the WorldWind SDK. If OpenGL framebuffer objects are not available on the host machine, // this setting is ignored. return false; } @@ -113,6 +135,6 @@ protected boolean isEnableFramebufferObjects() public static void main(String[] args) { - start("World Wind Configuring GL Runtime Capabilities", AppFrame.class); + start("WorldWind Configuring GL Runtime Capabilities", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ContextMenusOnShapes.java b/src/gov/nasa/worldwindx/examples/ContextMenusOnShapes.java index a70371d1f5..c432b47db4 100644 --- a/src/gov/nasa/worldwindx/examples/ContextMenusOnShapes.java +++ b/src/gov/nasa/worldwindx/examples/ContextMenusOnShapes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -27,66 +49,65 @@ * @author tag * @version $Id: ContextMenusOnShapes.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class ContextMenusOnShapes extends ApplicationTemplate -{ - /** The Controller listens for selection events and either highlights a selected item or shows its context menu. */ - protected static class ContextMenuController implements SelectListener - { +public class ContextMenusOnShapes extends ApplicationTemplate { + + /** + * The Controller listens for selection events and either highlights a selected item or shows its context menu. + */ + protected static class ContextMenuController implements SelectListener { + protected PointPlacemark lastPickedPlacemark = null; - public void selected(SelectEvent event) - { - try - { - if (event.getEventAction().equals(SelectEvent.ROLLOVER)) + @Override + public void selected(SelectEvent event) { + try { + if (event.getEventAction().equals(SelectEvent.ROLLOVER)) { highlight(event, event.getTopObject()); - else if (event.getEventAction().equals(SelectEvent.RIGHT_PRESS)) // Could do RIGHT_CLICK instead + } else if (event.getEventAction().equals(SelectEvent.RIGHT_PRESS)) // Could do RIGHT_CLICK instead + { showContextMenu(event); - } - catch (Exception e) - { + } + } catch (Exception e) { Util.getLogger().warning(e.getMessage() != null ? e.getMessage() : e.toString()); } } - @SuppressWarnings( {"UnusedDeclaration"}) - protected void highlight(SelectEvent event, Object o) - { - if (this.lastPickedPlacemark == o) + @SuppressWarnings({"UnusedDeclaration"}) + protected void highlight(SelectEvent event, Object o) { + if (this.lastPickedPlacemark == o) { return; // same thing selected - + } // Turn off highlight if on. - if (this.lastPickedPlacemark != null) - { + if (this.lastPickedPlacemark != null) { this.lastPickedPlacemark.setHighlighted(false); this.lastPickedPlacemark = null; } // Turn on highlight if object selected. - if (o != null && o instanceof PointPlacemark) - { + if (o != null && o instanceof PointPlacemark) { this.lastPickedPlacemark = (PointPlacemark) o; this.lastPickedPlacemark.setHighlighted(true); } } - protected void showContextMenu(SelectEvent event) - { - if (!(event.getTopObject() instanceof PointPlacemark)) + protected void showContextMenu(SelectEvent event) { + if (!(event.getTopObject() instanceof PointPlacemark)) { return; + } // See if the top picked object has context-menu info defined. Show the menu if it does. - Object o = event.getTopObject(); if (o instanceof AVList) // Uses an AVList in order to be applicable to all shapes. { AVList params = (AVList) o; ContextMenuInfo menuInfo = (ContextMenuInfo) params.getValue(ContextMenu.CONTEXT_MENU_INFO); - if (menuInfo == null) + if (menuInfo == null) { return; + } - if (!(event.getSource() instanceof Component)) + if (!(event.getSource() instanceof Component)) { return; + } ContextMenu menu = new ContextMenu((Component) event.getSource(), menuInfo); menu.show(event.getMouseEvent()); @@ -94,18 +115,19 @@ protected void showContextMenu(SelectEvent event) } } - /** The ContextMenu class implements the context menu. */ - protected static class ContextMenu - { + /** + * The ContextMenu class implements the context menu. + */ + protected static class ContextMenu { + public static final String CONTEXT_MENU_INFO = "ContextMenuInfo"; protected ContextMenuInfo ctxMenuInfo; protected Component sourceComponent; protected JMenuItem menuTitleItem; - protected ArrayList menuItems = new ArrayList(); + protected ArrayList menuItems = new ArrayList<>(); - public ContextMenu(Component sourceComponent, ContextMenuInfo contextMenuInfo) - { + public ContextMenu(Component sourceComponent, ContextMenuInfo contextMenuInfo) { this.sourceComponent = sourceComponent; this.ctxMenuInfo = contextMenuInfo; @@ -113,29 +135,24 @@ public ContextMenu(Component sourceComponent, ContextMenuInfo contextMenuInfo) this.makeMenuItems(); } - protected void makeMenuTitle() - { + protected void makeMenuTitle() { this.menuTitleItem = new JMenuItem(this.ctxMenuInfo.menuTitle); } - protected void makeMenuItems() - { - for (ContextMenuItemInfo itemInfo : this.ctxMenuInfo.menuItems) - { + protected void makeMenuItems() { + for (ContextMenuItemInfo itemInfo : this.ctxMenuInfo.menuItems) { this.menuItems.add(new JMenuItem(new ContextMenuItemAction(itemInfo))); } } - public void show(final MouseEvent event) - { + public void show(final MouseEvent event) { JPopupMenu popup = new JPopupMenu(); popup.add(this.menuTitleItem); popup.addSeparator(); - for (JMenuItem subMenu : this.menuItems) - { + for (JMenuItem subMenu : this.menuItems) { popup.add(subMenu); } @@ -143,59 +160,60 @@ public void show(final MouseEvent event) } } - /** The ContextMenuInfo class specifies the contents of the context menu. */ - protected static class ContextMenuInfo - { + /** + * The ContextMenuInfo class specifies the contents of the context menu. + */ + protected static class ContextMenuInfo { + protected String menuTitle; protected ContextMenuItemInfo[] menuItems; - public ContextMenuInfo(String title, ContextMenuItemInfo[] menuItems) - { + public ContextMenuInfo(String title, ContextMenuItemInfo[] menuItems) { this.menuTitle = title; this.menuItems = menuItems; } } - /** The ContextMenuItemInfo class specifies the contents of one entry in the context menu. */ - protected static class ContextMenuItemInfo - { + /** + * The ContextMenuItemInfo class specifies the contents of one entry in the context menu. + */ + protected static class ContextMenuItemInfo { + protected String displayString; - public ContextMenuItemInfo(String displayString) - { + public ContextMenuItemInfo(String displayString) { this.displayString = displayString; } } - /** The ContextMenuItemAction responds to user selection of a context menu item. */ - public static class ContextMenuItemAction extends AbstractAction - { + /** + * The ContextMenuItemAction responds to user selection of a context menu item. + */ + public static class ContextMenuItemAction extends AbstractAction { + protected ContextMenuItemInfo itemInfo; - public ContextMenuItemAction(ContextMenuItemInfo itemInfo) - { + public ContextMenuItemAction(ContextMenuItemInfo itemInfo) { super(itemInfo.displayString); this.itemInfo = itemInfo; } - public void actionPerformed(ActionEvent event) - { + @Override + public void actionPerformed(ActionEvent event) { System.out.println(this.itemInfo.displayString); // Replace with application's menu-item response. } } // The code below makes and displays some placemarks. The context menu info for each placemark is also specified. + public static class AppFrame extends ApplicationTemplate.AppFrame { - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { + public AppFrame() { RenderableLayer layer = new RenderableLayer(); // Create and set an attribute bundle. PointPlacemarkAttributes attrs = new PointPlacemarkAttributes(); - attrs.setAntiAliasHint(Polyline.ANTIALIAS_FASTEST); + attrs.setAntiAliasHint(WorldWind.ANTIALIAS_FASTEST); attrs.setLineMaterial(Material.WHITE); attrs.setLineWidth(2d); attrs.setImageAddress("images/pushpins/push-pin-yellow.png"); @@ -205,12 +223,10 @@ public AppFrame() PointPlacemarkAttributes highlightAttrs = new PointPlacemarkAttributes(attrs); highlightAttrs.setScale(0.7); - ContextMenuItemInfo[] itemActionNames = new ContextMenuItemInfo[] - { - new ContextMenuItemInfo("Do This"), - new ContextMenuItemInfo("Do That"), - new ContextMenuItemInfo("Do the Other Thing"), - }; + ContextMenuItemInfo[] itemActionNames = new ContextMenuItemInfo[]{ + new ContextMenuItemInfo("Do This"), + new ContextMenuItemInfo("Do That"), + new ContextMenuItemInfo("Do the Other Thing"),}; PointPlacemark pp = new PointPlacemark(Position.fromDegrees(28, -102, 1e4)); pp.setAttributes(attrs); @@ -254,8 +270,7 @@ public AppFrame() } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Context Menus on Shapes", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Context Menus on Shapes", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ContourBuilderExample.java b/src/gov/nasa/worldwindx/examples/ContourBuilderExample.java index 6f4c998f2e..bc8c443f58 100644 --- a/src/gov/nasa/worldwindx/examples/ContourBuilderExample.java +++ b/src/gov/nasa/worldwindx/examples/ContourBuilderExample.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -22,7 +44,7 @@ /** * Shows how to use the {@link gov.nasa.worldwind.util.ContourBuilder} class to compute contour lines in an arbitrary * rectangular array of numeric values. - *

                + *

                * This example creates a 60x60 rectangular array of floating point values in the range from 0.0 to 1.0, inclusive. The * array is displayed on the globe as an AnalyticSurface by mapping each array value to a color, where an array value of * 0.0 maps to hue 0, an array value of 1.0 maps to hue 360, and values in between are interpolated between those two @@ -95,8 +117,7 @@ protected void addContourShapes(List> contourList, double value, { Path path = new Path(positions); path.setAttributes(attrs); - path.setAltitudeMode(WorldWind.CLAMP_TO_GROUND); - path.setFollowTerrain(true); + path.setSurfacePath(true); path.setValue(AVKey.DISPLAY_NAME, text); layer.addRenderable(path); } @@ -138,6 +159,6 @@ protected String textForValue(double value) public static void main(String[] args) { - start("World Wind Contour Building", AppFrame.class); + start("WorldWind Contour Building", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ContourLines.java b/src/gov/nasa/worldwindx/examples/ContourLines.java index 0db6299ed4..0dbccd03e4 100644 --- a/src/gov/nasa/worldwindx/examples/ContourLines.java +++ b/src/gov/nasa/worldwindx/examples/ContourLines.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -18,26 +40,25 @@ import java.util.*; /** - * Illustrates how to display contour lines in World Wind on the surface terrain at a specified elevation. This uses the + * Illustrates how to display contour lines in WorldWind on the surface terrain at a specified elevation. This uses the * class {@link ContourLine} to compute and display the contour lines. * * @author Patrick Murris * @version $Id: ContourLines.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class ContourLines extends ApplicationTemplate -{ - public static class AppFrame extends ApplicationTemplate.AppFrame - { +public class ContourLines extends ApplicationTemplate { + + public static class AppFrame extends ApplicationTemplate.AppFrame { + protected ContourLine contourLine; - public AppFrame() - { + public AppFrame() { // Create a layer to display the contour lines. RenderableLayer layer = new RenderableLayer(); layer.setName("Contour Lines"); layer.setPickEnabled(false); - // Add the contour line layer to the World Window and update the layer panel. + // Add the contour line layer to the WorldWindow and update the layer panel. insertBeforePlacenames(getWwd(), layer); // Add a global moving contour line to the layer. @@ -46,25 +67,23 @@ public AppFrame() layer.addRenderable(this.contourLine); // Add a local contour line to the layer. - ArrayList positions = new ArrayList(); + ArrayList positions = new ArrayList<>(); positions.add(LatLon.fromDegrees(44.16, 6.82)); positions.add(LatLon.fromDegrees(44.16, 7.09)); positions.add(LatLon.fromDegrees(44.30, 6.95)); positions.add(LatLon.fromDegrees(44.16, 6.82)); - for (int elevation = 0; elevation <= 3000; elevation += 250) - { + for (int elevation = 0; elevation <= 3000; elevation += 250) { ContourLinePolygon cl = new ContourLinePolygon(elevation, positions); cl.setColor(new Color(0.2f, 0.2f, 0.8f)); - if (elevation % 1000 == 0) - { - cl.setLineWidth(2); + if (elevation % 1000 == 0) { cl.setColor(new Color(0.0f, 0.1f, 0.6f)); } - if (elevation % 500 == 0) + if (elevation % 500 == 0) { cl.setLineWidth(2); + } layer.addRenderable(cl); } @@ -73,29 +92,24 @@ public AppFrame() this.getControlPanel().add(this.makeContourLineControlPanel(), BorderLayout.SOUTH); } - protected JPanel makeContourLineControlPanel() - { + protected JPanel makeContourLineControlPanel() { JPanel controlPanel = new JPanel(); controlPanel.setLayout(new BoxLayout(controlPanel, BoxLayout.Y_AXIS)); controlPanel.setBorder(new CompoundBorder(BorderFactory.createEmptyBorder(9, 9, 9, 9), - new TitledBorder("Contour Line Elevation"))); + new TitledBorder("Contour Line Elevation"))); final JSlider slider = new JSlider(0, 3000, (int) this.contourLine.getElevation()); slider.setMajorTickSpacing(1000); slider.setMinorTickSpacing(250); slider.setPaintTicks(true); slider.setPaintLabels(true); - slider.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent event) - { - contourLine.setElevation(slider.getValue()); - getWwd().redraw(); - } + slider.addChangeListener((ChangeEvent event) -> { + contourLine.setElevation(slider.getValue()); + getWwd().redraw(); }); controlPanel.add(slider); - Hashtable labels = new Hashtable(); + Hashtable labels = new Hashtable<>(); labels.put(0, new JLabel("0km")); labels.put(1000, new JLabel("1km")); labels.put(2000, new JLabel("2km")); @@ -106,13 +120,12 @@ public void stateChanged(ChangeEvent event) } } - public static void main(String[] args) - { + public static void main(String[] args) { Configuration.setValue(AVKey.INITIAL_LATITUDE, 44.23); Configuration.setValue(AVKey.INITIAL_LONGITUDE, 6.92); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 30000); Configuration.setValue(AVKey.INITIAL_PITCH, 45); - ApplicationTemplate.start("World Wind Contour Lines", AppFrame.class); + ApplicationTemplate.start("WorldWind Contour Lines", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/CustomElevationModel.java b/src/gov/nasa/worldwindx/examples/CustomElevationModel.java index 040fbddac1..0677ea7828 100644 --- a/src/gov/nasa/worldwindx/examples/CustomElevationModel.java +++ b/src/gov/nasa/worldwindx/examples/CustomElevationModel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.avlist.AVKey; /** - * Illustrates how to configure World Wind with a custom {@link gov.nasa.worldwind.globes.ElevationModel} + * Illustrates how to configure WorldWind with a custom {@link gov.nasa.worldwind.globes.ElevationModel} * from a configuration file. * * @author tag @@ -19,10 +41,10 @@ public class CustomElevationModel extends ApplicationTemplate { public static void main(String[] args) { - // Specify the configuration file for the elevation model prior to starting World Wind: + // Specify the configuration file for the elevation model prior to starting WorldWind: Configuration.setValue(AVKey.EARTH_ELEVATION_MODEL_CONFIG_FILE, "gov/nasa/worldwindx/examples/data/CustomElevationModel.xml"); - ApplicationTemplate.start("World Wind Custom Elevation Model", AppFrame.class); + ApplicationTemplate.start("WorldWind Custom Elevation Model", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Cylinders.java b/src/gov/nasa/worldwindx/examples/Cylinders.java index a81183a991..fa5927cd5c 100644 --- a/src/gov/nasa/worldwindx/examples/Cylinders.java +++ b/src/gov/nasa/worldwindx/examples/Cylinders.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -19,7 +41,7 @@ import java.util.Hashtable; /** - * Illustrates how to use the World Wind {@link Cylinder} rigid shape to display an arbitrarily sized and + * Illustrates how to use the WorldWind {@link Cylinder} rigid shape to display an arbitrarily sized and * oriented cylinder at a geographic position on the Globe. * * @author ccrick @@ -206,7 +228,7 @@ protected void setCylinderDetailHint(double hint) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Cylinders", AppFrame.class); + ApplicationTemplate.start("WorldWind Cylinders", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java b/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java index 52cbb1f27c..354630adcf 100644 --- a/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java +++ b/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java @@ -1,30 +1,51 @@ /* - * Copyright (C) 2015 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; import gov.nasa.worldwind.*; import gov.nasa.worldwind.avlist.AVKey; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** * Illustrates how to capture OpenGL errors into the log during development. By defining a custom {@link - * gov.nasa.worldwind.WorldWindowGLDrawable} and installing JOGL's {@link javax.media.opengl.DebugGL2}, + * gov.nasa.worldwind.WorldWindowGLDrawable} and installing JOGL's {@link com.jogamp.opengl.DebugGL2}, * applications can receive log error messages when an OpenGL error occurs. This technique is intended for use during * application development, and should not be used in a deployed application. * * @author dcollins * @version $Id: DebuggingGLErrors.java 3433 2015-10-01 19:40:46Z dcollins $ */ -public class DebuggingGLErrors extends ApplicationTemplate -{ - static - { +public class DebuggingGLErrors extends ApplicationTemplate { + + static { // Modify the configuration to specify our custom WorldWindowGLDrawable. Normally, an application would specify - // this in a configuration file. For example, via the standard World Wind XML configuration file: + // this in a configuration file. For example, via the standard WorldWind XML configuration file: // // // ... @@ -32,7 +53,7 @@ public class DebuggingGLErrors extends ApplicationTemplate // ... // // - // Or via the legacy World Wind properties file: + // Or via the legacy WorldWind properties file: // // ... // gov.nasa.worldwind.avkey.WorldWindowClassName=MyGLAutoDrawableClassName @@ -44,26 +65,27 @@ public class DebuggingGLErrors extends ApplicationTemplate /** * Subclass of {@link gov.nasa.worldwind.WorldWindowGLAutoDrawable} which overrides the method {@link - * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(javax.media.opengl.GLAutoDrawable)} to configure the OpenGL + * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(com.jogamp.opengl.GLAutoDrawable)} to configure the OpenGL * error logger. */ - public static class MyGLAutoDrawable extends WorldWindowGLAutoDrawable - { - /** Constructs a new MyGLAutoDrawable, but otherwise does nothing. */ - public MyGLAutoDrawable() - { + public static class MyGLAutoDrawable extends WorldWindowGLAutoDrawable { + + /** + * Constructs a new MyGLAutoDrawable, but otherwise does nothing. + */ + public MyGLAutoDrawable() { } /** - * Overridden to configure the OpenGL features used by the World Wind SDK. See {@link - * javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable)}. + * Overridden to configure the OpenGL features used by the WorldWind SDK. See {@link + * com.jogamp.opengl.GLEventListener#init(com.jogamp.opengl.GLAutoDrawable)}. * * @param glAutoDrawable the drawable */ - public void init(GLAutoDrawable glAutoDrawable) - { + @Override + public void init(GLAutoDrawable glAutoDrawable) { // Invoked when the GL context changes. The host machine capabilities may have changed, so re-configure the - // OpenGL features used by the World Wind SDK. + // OpenGL features used by the WorldWind SDK. super.init(glAutoDrawable); // Install the OpenGL error debugger. Under normal operation OpenGL errors are silently flagged. This @@ -74,8 +96,7 @@ public void init(GLAutoDrawable glAutoDrawable) } } - public static void main(String[] args) - { - start("World Wind Debugging GL Errors", AppFrame.class); + public static void main(String[] args) { + start("WorldWind Debugging GL Errors", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/DeepPicking.java b/src/gov/nasa/worldwindx/examples/DeepPicking.java index b9efc9ca80..2bba6da74e 100644 --- a/src/gov/nasa/worldwindx/examples/DeepPicking.java +++ b/src/gov/nasa/worldwindx/examples/DeepPicking.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -15,7 +37,7 @@ * Illustrates how to cause all elements under the cursor in a WorldWindow to be reported in {@link * SelectEvent}s. This prints all elements under the cursor to the console in response to a HOVER * SelectEvent. - *

                + *

                * In order to enable deep picking, any batch picking for the desired elements must be disabled and the * SceneController's deep picking property must be enabled. See {@link gov.nasa.worldwind.SceneController#setDeepPickEnabled(boolean)}. * @@ -71,6 +93,6 @@ protected void disableBatchPicking() public static void main(String[] args) { - start("World Wind Deep Picking", AppFrame.class); + start("WorldWind Deep Picking", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/DetailHints.java b/src/gov/nasa/worldwindx/examples/DetailHints.java index 98ddcc1718..9a78a26cb2 100644 --- a/src/gov/nasa/worldwindx/examples/DetailHints.java +++ b/src/gov/nasa/worldwindx/examples/DetailHints.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -133,6 +155,6 @@ public void stateChanged(ChangeEvent e) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Detail Hints", AppFrame.class); + ApplicationTemplate.start("WorldWind Detail Hints", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/DimGlobeSurface.java b/src/gov/nasa/worldwindx/examples/DimGlobeSurface.java index 6b214b8963..7fba1c85d0 100644 --- a/src/gov/nasa/worldwindx/examples/DimGlobeSurface.java +++ b/src/gov/nasa/worldwindx/examples/DimGlobeSurface.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -94,6 +116,6 @@ public void stateChanged(ChangeEvent event) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Surface Dimming", AppFrame.class); + ApplicationTemplate.start("WorldWind Surface Dimming", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/DraggingShapes.java b/src/gov/nasa/worldwindx/examples/DraggingShapes.java index 91fc9568be..87098b835e 100644 --- a/src/gov/nasa/worldwindx/examples/DraggingShapes.java +++ b/src/gov/nasa/worldwindx/examples/DraggingShapes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -14,7 +36,7 @@ import java.util.Arrays; /** - * Illustrates how to enable shape dragging in World Wind by using a {@link gov.nasa.worldwind.util.BasicDragger}. This creates + * Illustrates how to enable shape dragging in WorldWind by using a {@link gov.nasa.worldwind.util.BasicDragger}. This creates * multiple shapes on the surface terrain that can be dragged to a new location on the terrain. The shapes retain their * form when dragged. * @@ -29,7 +51,7 @@ protected static class AppFrame extends ApplicationTemplate.AppFrame public AppFrame() { - // Add a basic dragger to the World Window's select listeners to enable shape dragging. + // Add a basic dragger to the WorldWindow's select listeners to enable shape dragging. this.getWwd().addSelectListener(new BasicDragger(this.getWwd())); // Create a layer of shapes to drag. @@ -187,6 +209,6 @@ protected void makeShapes() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Dragging Shapes", AppFrame.class); + ApplicationTemplate.start("WorldWind Dragging Shapes", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/EGM96Offsets.java b/src/gov/nasa/worldwindx/examples/EGM96Offsets.java index 748fbaedbe..a64d11b1bc 100644 --- a/src/gov/nasa/worldwindx/examples/EGM96Offsets.java +++ b/src/gov/nasa/worldwindx/examples/EGM96Offsets.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2013 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -36,6 +58,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind EGM96 Offsets", AppFrame.class); + ApplicationTemplate.start("WorldWind EGM96 Offsets", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ElevationsAllZero.java b/src/gov/nasa/worldwindx/examples/ElevationsAllZero.java index cd8cd250b8..2224cbbecf 100644 --- a/src/gov/nasa/worldwindx/examples/ElevationsAllZero.java +++ b/src/gov/nasa/worldwindx/examples/ElevationsAllZero.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -36,6 +58,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Zero Elevations", AppFrame.class); + ApplicationTemplate.start("WorldWind Zero Elevations", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Ellipsoids.java b/src/gov/nasa/worldwindx/examples/Ellipsoids.java index e5ed24a548..f567e678b9 100644 --- a/src/gov/nasa/worldwindx/examples/Ellipsoids.java +++ b/src/gov/nasa/worldwindx/examples/Ellipsoids.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -18,7 +40,7 @@ import java.util.Hashtable; /** - * Illustrates how to use the World Wind {@link Ellipsoid} rigid shape to display an arbitrarily sized and + * Illustrates how to use the WorldWind {@link Ellipsoid} rigid shape to display an arbitrarily sized and * oriented ellipsoid at a geographic position on the Globe. * * @author ccrick @@ -204,6 +226,6 @@ protected void setEllipsoidDetailHint(double hint) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Ellipsoids", AppFrame.class); + ApplicationTemplate.start("WorldWind Ellipsoids", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ExportImageOrElevations.java b/src/gov/nasa/worldwindx/examples/ExportImageOrElevations.java index ed0ec27e3a..830f39da13 100644 --- a/src/gov/nasa/worldwindx/examples/ExportImageOrElevations.java +++ b/src/gov/nasa/worldwindx/examples/ExportImageOrElevations.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -529,6 +551,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LATITUDE, 37.7794d); Configuration.setValue(AVKey.INITIAL_LONGITUDE, -122.4192d); - ApplicationTemplate.start("World Wind Exporting Surface Imagery and Elevations", AppFrame.class); + ApplicationTemplate.start("WorldWind Exporting Surface Imagery and Elevations", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ExtrudedPolygonWithBaseDepth.java b/src/gov/nasa/worldwindx/examples/ExtrudedPolygonWithBaseDepth.java index fe732a7a65..59126e2d35 100644 --- a/src/gov/nasa/worldwindx/examples/ExtrudedPolygonWithBaseDepth.java +++ b/src/gov/nasa/worldwindx/examples/ExtrudedPolygonWithBaseDepth.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -83,6 +105,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Extruded Polygon with Base Depth", AppFrame.class); + ApplicationTemplate.start("WorldWind Extruded Polygon with Base Depth", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ExtrudedPolygons.java b/src/gov/nasa/worldwindx/examples/ExtrudedPolygons.java index 3a986834a4..08372ed572 100644 --- a/src/gov/nasa/worldwindx/examples/ExtrudedPolygons.java +++ b/src/gov/nasa/worldwindx/examples/ExtrudedPolygons.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -94,6 +116,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Extruded Polygons", AppFrame.class); + ApplicationTemplate.start("WorldWind Extruded Polygons", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ExtrudedPolygonsFromShapefile.java b/src/gov/nasa/worldwindx/examples/ExtrudedPolygonsFromShapefile.java index 8449f26d12..e161da62c4 100644 --- a/src/gov/nasa/worldwindx/examples/ExtrudedPolygonsFromShapefile.java +++ b/src/gov/nasa/worldwindx/examples/ExtrudedPolygonsFromShapefile.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -36,7 +58,7 @@ public void completion(Object result) final Layer layer = (Layer) result; // the result is the layer the factory created layer.setName(WWIO.getFilename(layer.getName())); - // Add the layer to the World Window's layer list on the Event Dispatch Thread. + // Add the layer to the WorldWindow's layer list on the Event Dispatch Thread. SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/src/gov/nasa/worldwindx/examples/ExtrudedShapes.java b/src/gov/nasa/worldwindx/examples/ExtrudedShapes.java index 211febbc47..d84c5ff124 100644 --- a/src/gov/nasa/worldwindx/examples/ExtrudedShapes.java +++ b/src/gov/nasa/worldwindx/examples/ExtrudedShapes.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.examples; import gov.nasa.worldwind.View; @@ -23,32 +44,30 @@ /** * Demonstrates how to create {@link ExtrudedPolygon}s with cap and side textures. The polygon geometry is retrieved - * from a World Wind data site, as is the image applied to the extruded polygon's sides. + * from a WorldWind data site, as is the image applied to the extruded polygon's sides. * * @author tag * @version $Id: ExtrudedShapes.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class ExtrudedShapes extends ApplicationTemplate -{ +public class ExtrudedShapes extends ApplicationTemplate { + protected static final String DEMO_AIRSPACES_PATH - = "gov/nasa/worldwindx/examples/data/AirspaceBuilder-DemoShapes.zip"; + = "gov/nasa/worldwindx/examples/data/AirspaceBuilder-DemoShapes.zip"; protected static String DEFAULT_IMAGE_URL = "gov/nasa/worldwindx/examples/images/build123sm.jpg"; - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { + public static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, true, false); - try - { + try { // Create a layer for the shapes. RenderableLayer layer = new RenderableLayer(); layer.setName("Extruded Shapes"); layer.setPickEnabled(true); - // Retrieve the geometry from the World Wind demo site. - List airspaces = new ArrayList(); + // Retrieve the geometry from the WorldWind demo site. + List airspaces = new ArrayList<>(); loadAirspacesFromPath(DEMO_AIRSPACES_PATH, airspaces); // Define attributes for the shapes. @@ -61,16 +80,14 @@ public AppFrame() // Construct the extruded polygons from the demo data. int n = 0, m = 0; - for (Airspace airspace : airspaces) - { + for (Airspace airspace : airspaces) { if (airspace instanceof Polygon) // only polygons in the demo data are used { Polygon pgonAirspace = (Polygon) airspace; // Collect the images to be applied to the shape's sides. - ArrayList textures = new ArrayList(); - for (int i = 0; i < pgonAirspace.getLocations().size(); i++) - { + ArrayList textures = new ArrayList<>(); + for (int i = 0; i < pgonAirspace.getLocations().size(); i++) { textures.add(DEFAULT_IMAGE_URL); } @@ -83,9 +100,8 @@ public AppFrame() quad.setCapAttributes(capAttributes); // Specify a cap for the extruded polygon, specifying its texture coordinates and image. - if (pgonAirspace.getLocations().size() == 4) - { - float[] texCoords = new float[] {0, 0, 1, 0, 1, 1, 0, 1}; + if (pgonAirspace.getLocations().size() == 4) { + float[] texCoords = new float[]{0, 0, 1, 0, 1, 1, 0, 1}; quad.setCapImageSource("images/32x32-icon-nasa.png", texCoords, 4); } @@ -107,73 +123,61 @@ public AppFrame() view.setEyePosition(Position.fromDegrees(47.656, -122.306, 1e3)); // This is how a select listener would notice that one of the shapes was picked. - getWwd().addSelectListener(new SelectListener() - { - public void selected(SelectEvent event) - { - if (event.getTopObject() instanceof ExtrudedPolygon) - System.out.println("EXTRUDED POLYGON"); + getWwd().addSelectListener((SelectEvent event) -> { + if (event.getTopObject() instanceof ExtrudedPolygon) { + System.out.println("EXTRUDED POLYGON"); } }); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } } } - protected static void loadAirspacesFromPath(String path, Collection airspaces) - { + protected static void loadAirspacesFromPath(String path, Collection airspaces) { File file = ExampleUtil.saveResourceToTempFile(path, ".zip"); - if (file == null) + if (file == null) { return; + } - try - { + try { ZipFile zipFile = new ZipFile(file); ZipEntry entry = null; - for (Enumeration e = zipFile.entries(); e.hasMoreElements(); entry = e.nextElement()) - { - if (entry == null) + for (Enumeration e = zipFile.entries(); e.hasMoreElements(); entry = e.nextElement()) { + if (entry == null) { continue; + } String name = WWIO.getFilename(entry.getName()); - if (!(name.startsWith("gov.nasa.worldwind.render.airspaces") && name.endsWith(".xml"))) + if (!(name.startsWith("gov.nasa.worldwind.render.airspaces") && name.endsWith(".xml"))) { continue; + } String[] tokens = name.split("-"); - try - { - Class c = Class.forName(tokens[0]); - Airspace airspace = (Airspace) c.newInstance(); + try { + Class c = Class.forName(tokens[0]); + Airspace airspace = (Airspace) c.getConstructor().newInstance(); BufferedReader input = new BufferedReader(new InputStreamReader(zipFile.getInputStream(entry))); String s = input.readLine(); airspace.restoreState(s); airspaces.add(airspace); - if (tokens.length >= 2) - { + if (tokens.length >= 2) { airspace.setValue(AVKey.DISPLAY_NAME, tokens[1]); } - } - catch (Exception ex) - { + } catch (Exception ex) { ex.printStackTrace(); } } - } - catch (IOException e) - { + } catch (IOException e) { e.printStackTrace(); } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Extruded Polygons on Ground", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Extruded Polygons on Ground", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/FlatWorld.java b/src/gov/nasa/worldwindx/examples/FlatWorld.java index b236061f09..8297cb7317 100644 --- a/src/gov/nasa/worldwindx/examples/FlatWorld.java +++ b/src/gov/nasa/worldwindx/examples/FlatWorld.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -258,6 +280,6 @@ public static void main(String[] args) { // Adjust configuration values before instantiation Configuration.setValue(AVKey.GLOBE_CLASS_NAME, EarthFlat.class.getName()); - start("World Wind Flat World", AppFrame.class); + start("WorldWind Flat World", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java b/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java index 1a02738a25..a1eefe67fc 100644 --- a/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java +++ b/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -16,7 +38,7 @@ import gov.nasa.worldwind.util.*; import gov.nasa.worldwind.view.orbit.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.*; import javax.swing.border.*; import java.awt.*; @@ -609,6 +631,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LONGITUDE, 0); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 50e6); Configuration.setValue(AVKey.GLOBE_CLASS_NAME, EarthFlat.class.getName()); - ApplicationTemplate.start("World Wind USGS Earthquakes M 2.5+ - 7 days", AppFrame.class); + ApplicationTemplate.start("WorldWind USGS Earthquakes M 2.5+ - 7 days", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/FlatWorldPanel.java b/src/gov/nasa/worldwindx/examples/FlatWorldPanel.java index c49b67d380..4de4414fa5 100644 --- a/src/gov/nasa/worldwindx/examples/FlatWorldPanel.java +++ b/src/gov/nasa/worldwindx/examples/FlatWorldPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/GARSGraticule.java b/src/gov/nasa/worldwindx/examples/GARSGraticule.java index 4feca688c1..64bc07e0d1 100644 --- a/src/gov/nasa/worldwindx/examples/GARSGraticule.java +++ b/src/gov/nasa/worldwindx/examples/GARSGraticule.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -43,6 +65,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind GARS Graticule", AppFrame.class); + ApplicationTemplate.start("WorldWind GARS Graticule", AppFrame.class); } } \ No newline at end of file diff --git a/src/gov/nasa/worldwindx/examples/GPSTracks.java b/src/gov/nasa/worldwindx/examples/GPSTracks.java index 711c3c265e..f8f497c6ec 100644 --- a/src/gov/nasa/worldwindx/examples/GPSTracks.java +++ b/src/gov/nasa/worldwindx/examples/GPSTracks.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -103,6 +125,6 @@ protected MarkerLayer buildTracksLayer() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Tracks", AppFrame.class); + ApplicationTemplate.start("WorldWind Tracks", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/GazetteerApp.java b/src/gov/nasa/worldwindx/examples/GazetteerApp.java index 65c4e24f3e..a28cf01c6a 100644 --- a/src/gov/nasa/worldwindx/examples/GazetteerApp.java +++ b/src/gov/nasa/worldwindx/examples/GazetteerApp.java @@ -1,11 +1,34 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; import java.awt.*; +import java.lang.reflect.InvocationTargetException; /** * Example of integrating a gazetteer search function using the {@link gov.nasa.worldwind.poi.YahooGazetteer}. @@ -19,7 +42,7 @@ public class GazetteerApp extends ApplicationTemplate { public static class AppFrame extends ApplicationTemplate.AppFrame { - public AppFrame() throws IllegalAccessException, InstantiationException, ClassNotFoundException + public AppFrame() throws IllegalAccessException, InstantiationException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException { super(true, false, false); @@ -30,6 +53,6 @@ public AppFrame() throws IllegalAccessException, InstantiationException, ClassNo public static void main(String[] args) { - ApplicationTemplate.start("World Wind Gazetteer Example", AppFrame.class); + ApplicationTemplate.start("WorldWind Gazetteer Example", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/GazetteerPanel.java b/src/gov/nasa/worldwindx/examples/GazetteerPanel.java index 6e5736a81c..905cebf2f5 100644 --- a/src/gov/nasa/worldwindx/examples/GazetteerPanel.java +++ b/src/gov/nasa/worldwindx/examples/GazetteerPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -24,6 +46,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.regex.*; +import java.lang.reflect.InvocationTargetException; /** * Gazetteer search panel that allows the user to enter a search term in a text field. When a search is performed the @@ -43,16 +66,18 @@ public class GazetteerPanel extends JPanel /** * Create a new panel. * - * @param wwd World window to animate when a search is performed. + * @param wwd WorldWindow to animate when a search is performed. * @param gazetteerClassName Name of the gazetteer class to instantiate. If this parameter is {@code null} a {@link * YahooGazetteer} is instantiated. * * @throws IllegalAccessException if the gazetteer class does not expose a publicly accessible no-arg constructor. * @throws InstantiationException if an exception occurs while instantiating the the gazetteer class. * @throws ClassNotFoundException if the gazetteer class cannot be found. + * @throws java.lang.NoSuchMethodException if the gazetteer class doesn't have a default constructor. + * @throws java.lang.reflect.InvocationTargetException if the gazetteer class construction fails. */ public GazetteerPanel(final WorldWindow wwd, String gazetteerClassName) - throws IllegalAccessException, InstantiationException, ClassNotFoundException + throws IllegalAccessException, InstantiationException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException { super(new BorderLayout()); @@ -145,7 +170,7 @@ public void run() } private Gazetteer constructGazetteer(String className) - throws ClassNotFoundException, IllegalAccessException, InstantiationException + throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException { if (className == null || className.length() == 0) { @@ -153,7 +178,7 @@ private Gazetteer constructGazetteer(String className) } Class c = Class.forName(className.trim()); - Object o = c.newInstance(); + Object o = c.getConstructor().newInstance(); if (!(o instanceof Gazetteer)) throw new IllegalArgumentException("Gazetteer class name is null"); diff --git a/src/gov/nasa/worldwindx/examples/GeoJSONLoader.java b/src/gov/nasa/worldwindx/examples/GeoJSONLoader.java index d5d6dfffe2..14f1539eb0 100644 --- a/src/gov/nasa/worldwindx/examples/GeoJSONLoader.java +++ b/src/gov/nasa/worldwindx/examples/GeoJSONLoader.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/GeoRSS.java b/src/gov/nasa/worldwindx/examples/GeoRSS.java index 970033fe0a..d68237f1d4 100644 --- a/src/gov/nasa/worldwindx/examples/GeoRSS.java +++ b/src/gov/nasa/worldwindx/examples/GeoRSS.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -16,12 +38,11 @@ * @author dcollins * @version $Id: GeoRSS.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class GeoRSS extends ApplicationTemplate -{ - private static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { +public class GeoRSS extends ApplicationTemplate { + + private static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, true, false); RenderableLayer layer = this.buildGeoRSSLayer(); @@ -29,90 +50,121 @@ public AppFrame() insertBeforePlacenames(this.getWwd(), layer); } - private RenderableLayer buildGeoRSSLayer() - { + private RenderableLayer buildGeoRSSLayer() { RenderableLayer layer = new RenderableLayer(); java.util.List shapes; shapes = GeoRSSParser.parseShapes(GeoRSS_DOCSTRING_A); - if (shapes != null) + if (shapes != null) { addRenderables(layer, shapes); + } shapes = GeoRSSParser.parseShapes(GeoRSS_DOCSTRING_B); - if (shapes != null) + if (shapes != null) { addRenderables(layer, shapes); + } + + shapes = GeoRSSParser.parseShapes(GeoRSS_DOCSTRING_C); + if (shapes != null) { + addRenderables(layer, shapes); + } return layer; } - private void addRenderables(RenderableLayer layer, Iterable renderables) - { - for (Renderable r : renderables) + private void addRenderables(RenderableLayer layer, Iterable renderables) { + for (Renderable r : renderables) { layer.addRenderable(r); + } } } - private static final String GeoRSS_DOCSTRING_A = - "" + - "" + - " Earthquakes" + - " International earthquake observation labs" + - " " + - " 2005-12-13T18:30:02Z" + - " " + - " Dr. Thaddeus Remor" + - " tremor@quakelab.edu" + - " " + - " urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6" + - " " + - " M 3.2, Mona Passage" + - " " + - " urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" + - " 2005-08-17T07:02:32Z" + - "

                We just had a big one." + - " " + - " " + - " " + - " " + - " " + - " 45.256 -110.45 46.46 -109.48 43.84 -109.86 45.256 -110.45" + - " " + - " " + - " " + - " " + - " " + - " " + - ""; + private static final String GeoRSS_DOCSTRING_A + = "" + + "" + + " Earthquakes" + + " International earthquake observation labs" + + " " + + " 2005-12-13T18:30:02Z" + + " " + + " Dr. Thaddeus Remor" + + " tremor@quakelab.edu" + + " " + + " urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6" + + " " + + " M 3.2, Mona Passage" + + " " + + " urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" + + " 2005-08-17T07:02:32Z" + + " We just had a big one." + + " " + + " " + + " " + + " " + + " " + + " 45.256 -110.45 46.46 -109.48 43.84 -109.86 45.256 -110.45" + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + + private static final String GeoRSS_DOCSTRING_B + = "" + + " scribble" + + " http://example.com/atom" + + " Christopher Schmidt" + + "" + + " http://example.com/19.atom" + + " " + + " Feature #19" + + " Some content." + + " " + + " 23.1811523438 -159.609375 " + + " 22.5 -161.564941406 " + + " 20.654296875 -160.422363281 " + + " 18.4350585938 -156.247558594 " + + " 18.3471679688 -154.731445312 " + + " 19.951171875 -153.588867188 " + + " 21.8188476562 -155.983886719" + + " 23.02734375 -158.994140625" + + " 23.0932617188 -159.631347656" + + " " + + "" + + ""; - private static final String GeoRSS_DOCSTRING_B = - "" + - " scribble" + - " http://example.com/atom" + - " Christopher Schmidt" + - "" + - " http://example.com/19.atom" + - " " + - " Feature #19" + - " Some content." + - " " + - " 23.1811523438 -159.609375 " + - " 22.5 -161.564941406 " + - " 20.654296875 -160.422363281 " + - " 18.4350585938 -156.247558594 " + - " 18.3471679688 -154.731445312 " + - " 19.951171875 -153.588867188 " + - " 21.8188476562 -155.983886719" + - " 23.02734375 -158.994140625" + - " 23.0932617188 -159.631347656" + - " " + - "" + - ""; + private static final String GeoRSS_DOCSTRING_C + = "" + + "" + + " An X" + + " Line test" + + " " + + " 2005-12-13T18:30:02Z" + + " " + + " NASA" + + " nasa@nasa.gov" + + " " + + " urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6" + + " " + + " An X" + + " " + + " urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" + + " 2005-08-17T07:02:32Z" + + " Test" + + " 45 -95 44 -94" + + " 45 -94 44 -95" + + " 1000" + + " " + + ""; - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind GeoRSS", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind GeoRSS", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/GetBestElevations.java b/src/gov/nasa/worldwindx/examples/GetBestElevations.java index 6ca3c96259..68d7395cb6 100644 --- a/src/gov/nasa/worldwindx/examples/GetBestElevations.java +++ b/src/gov/nasa/worldwindx/examples/GetBestElevations.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.examples; import gov.nasa.worldwind.geom.*; @@ -20,7 +41,7 @@ /** * Retrieve the highest-resolution elevations available for the current elevation model, drawing them from the server if * necessary. Shift-click on the globe to retrieve the elevation of a location. - *

                + *

                * Note: The {@link gov.nasa.worldwind.terrain.HighResolutionTerrain} class may be more appropriate to your needs than * this example. * @@ -28,16 +49,16 @@ * @version $Id: GetBestElevations.java 1171 2013-02-11 21:45:02Z dcollins $ * @see gov.nasa.worldwind.terrain.HighResolutionTerrain */ -public class GetBestElevations extends ApplicationTemplate -{ - public static class AppFrame extends ApplicationTemplate.AppFrame - { +public class GetBestElevations extends ApplicationTemplate { + + public static class AppFrame extends ApplicationTemplate.AppFrame { + /** * Retrieve elevations for a specified list of locations. The elevations returned are the best currently * available for the dataset and the area bounding the locations. Since the necessary elevation data might not * be in memory at the time of the call, this method iterates until the necessary elevation data is in memory * and can be used to determine the locations' elevations. - *

                + *

                * The locations must have a bounding sector, so more than one location is required. If the bounding region is * large, a huge amount of data must be retrieved from the server. Be aware that you are overriding the system's * resolution selection mechanism by requesting the highest resolution data, which could easily be gigabytes. @@ -48,8 +69,7 @@ public static class AppFrame extends ApplicationTemplate.AppFrame * * @return the resolution actually achieved. */ - public double[] getBestElevations(List locations) - { + public double[] getBestElevations(List locations) { Globe globe = this.getWwd().getModel().getGlobe(); Sector sector = Sector.boundingSector(locations); double[] elevations = new double[locations.size()]; @@ -57,18 +77,14 @@ public double[] getBestElevations(List locations) // Iterate until the best resolution is achieved. Use the elevation model to determine the best elevation. double targetResolution = globe.getElevationModel().getBestResolution(sector); double actualResolution = Double.MAX_VALUE; - while (actualResolution > targetResolution) - { + while (actualResolution > targetResolution) { actualResolution = globe.getElevations(sector, locations, targetResolution, elevations); // Uncomment the two lines below if you want to watch the resolution converge // System.out.printf("Target resolution = %s, Actual resolution = %s\n", // Double.toString(targetResolution), Double.toString(actualResolution)); - try - { + try { Thread.sleep(200); // give the system a chance to retrieve data from the disk cache or the server - } - catch (InterruptedException e) - { + } catch (InterruptedException e) { e.printStackTrace(); } } @@ -76,76 +92,67 @@ public double[] getBestElevations(List locations) return elevations; } - public AppFrame() - { + public AppFrame() { super(true, true, false); final ScreenAnnotation annotation = new ScreenAnnotation("Shift-click to select a location", - new Point(100, 50)); + new Point(100, 50)); AnnotationLayer layer = new AnnotationLayer(); layer.addAnnotation(annotation); insertBeforeCompass(this.getWwd(), layer); - this.getWwd().getInputHandler().addMouseListener(new MouseListener() - { - public void mouseClicked(MouseEvent mouseEvent) - { - if ((mouseEvent.getModifiers() & ActionEvent.SHIFT_MASK) == 0) + this.getWwd().getInputHandler().addMouseListener(new MouseListener() { + @Override + public void mouseClicked(MouseEvent mouseEvent) { + if ((mouseEvent.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) == 0) { return; + } mouseEvent.consume(); final Position pos = getWwd().getCurrentPosition(); - if (pos == null) + if (pos == null) { return; + } annotation.setText(String.format("Elevation = ")); getWwd().redraw(); // Run the elevation query in a separate thread to avoid locking up the user interface - Thread t = new Thread(new Runnable() - { - public void run() - { - // We want elevation for only one location, so add a second location that's very near the - // desired one. This causes fewer requests to the disk or server, and causes faster - // convergence. - List locations = Arrays.asList(pos, pos.add(LatLon.fromDegrees(0.00001, 0.00001))); - final double[] elevations = getBestElevations(locations); - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - annotation.setText(String.format("Elevation = %d m", (int) elevations[0])); - getWwd().redraw(); - } - }); - } + Thread t = new Thread(() -> { + // We want elevation for only one location, so add a second location that's very near the + // desired one. This causes fewer requests to the disk or server, and causes faster + // convergence. + List locations = Arrays.asList(pos, pos.add(LatLon.fromDegrees(0.00001, 0.00001))); + final double[] elevations = getBestElevations(locations); + SwingUtilities.invokeLater(() -> { + annotation.setText(String.format("Elevation = %d m", (int) elevations[0])); + getWwd().redraw(); + }); }); t.start(); } - public void mouseEntered(MouseEvent mouseEvent) - { + @Override + public void mouseEntered(MouseEvent mouseEvent) { } - public void mouseExited(MouseEvent mouseEvent) - { + @Override + public void mouseExited(MouseEvent mouseEvent) { } - public void mousePressed(MouseEvent mouseEvent) - { + @Override + public void mousePressed(MouseEvent mouseEvent) { } - public void mouseReleased(MouseEvent mouseEvent) - { + @Override + public void mouseReleased(MouseEvent mouseEvent) { } }); } } - public static void main(String[] args) - { + public static void main(String[] args) { // Adjust configuration values before instantiation - ApplicationTemplate.start("World Wind Get Best Elevations", AppFrame.class); + ApplicationTemplate.start("WorldWind Get Best Elevations", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/GlobeAnnotationExample.java b/src/gov/nasa/worldwindx/examples/GlobeAnnotationExample.java index 20dade1107..92732b716d 100644 --- a/src/gov/nasa/worldwindx/examples/GlobeAnnotationExample.java +++ b/src/gov/nasa/worldwindx/examples/GlobeAnnotationExample.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -35,6 +57,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Globe Annotation", AppFrame.class); + ApplicationTemplate.start("WorldWind Globe Annotation", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/GoToCoordinatePanel.java b/src/gov/nasa/worldwindx/examples/GoToCoordinatePanel.java index ce15a11596..eb84be5553 100644 --- a/src/gov/nasa/worldwindx/examples/GoToCoordinatePanel.java +++ b/src/gov/nasa/worldwindx/examples/GoToCoordinatePanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -22,15 +44,17 @@ * decimal degrees. *

                * Supported format are: + *

                *
                  *
                • MGRS strings with or without separating spaces.
                • *
                • Decimal degrees with sign prefix or N, S, E, W suffix.
                • *
                • Degrees, minutes and seconds with sign prefix or N, S, E, W suffix.
                • *
                * The separator between lat/lon pairs can be ',', ', ' or any number of spaces. - *

                *

                - * Examples:

                + * Examples:
                + * 

                + *
                  * 11sku528111
                  * 11S KU 528 111
                  *
                @@ -40,7 +64,6 @@
                  *
                  * 45 30 N 50 30 W
                  * 
                - *

                * * @author Patrick Murris * @version $Id: GoToCoordinatePanel.java 1171 2013-02-11 21:45:02Z dcollins $ diff --git a/src/gov/nasa/worldwindx/examples/Graticule.java b/src/gov/nasa/worldwindx/examples/Graticule.java index c97536da9f..250bde2f24 100644 --- a/src/gov/nasa/worldwindx/examples/Graticule.java +++ b/src/gov/nasa/worldwindx/examples/Graticule.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -30,6 +52,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Lat-Lon Graticule", AppFrame.class); + ApplicationTemplate.start("WorldWind Lat-Lon Graticule", AppFrame.class); } } \ No newline at end of file diff --git a/src/gov/nasa/worldwindx/examples/GraticuleAttributesPanel.java b/src/gov/nasa/worldwindx/examples/GraticuleAttributesPanel.java index 68714a9557..7f33b38699 100644 --- a/src/gov/nasa/worldwindx/examples/GraticuleAttributesPanel.java +++ b/src/gov/nasa/worldwindx/examples/GraticuleAttributesPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/HelloWorldWind.java b/src/gov/nasa/worldwindx/examples/HelloWorldWind.java index ed98586367..28cb155a0b 100644 --- a/src/gov/nasa/worldwindx/examples/HelloWorldWind.java +++ b/src/gov/nasa/worldwindx/examples/HelloWorldWind.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -9,7 +31,7 @@ import gov.nasa.worldwind.awt.WorldWindowGLCanvas; /** - * This is the most basic World Wind program. + * This is the most basic WorldWind program. * * @version $Id: HelloWorldWind.java 1971 2014-04-29 21:31:28Z dcollins $ */ @@ -37,7 +59,7 @@ public static void main(String[] args) { if (Configuration.isMacOS()) { - System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Hello World Wind"); + System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Hello WorldWind"); } java.awt.EventQueue.invokeLater(new Runnable() diff --git a/src/gov/nasa/worldwindx/examples/HighResolutionTerrainTest.java b/src/gov/nasa/worldwindx/examples/HighResolutionTerrainTest.java index 830ccf7377..73e371caa6 100644 --- a/src/gov/nasa/worldwindx/examples/HighResolutionTerrainTest.java +++ b/src/gov/nasa/worldwindx/examples/HighResolutionTerrainTest.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/IconPicking.java b/src/gov/nasa/worldwindx/examples/IconPicking.java index d30e1e3956..72aeb1c9b0 100644 --- a/src/gov/nasa/worldwindx/examples/IconPicking.java +++ b/src/gov/nasa/worldwindx/examples/IconPicking.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -91,6 +113,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_ALTITUDE, 27e6); Configuration.setValue(AVKey.INITIAL_LATITUDE, 0); Configuration.setValue(AVKey.INITIAL_LONGITUDE, 88); - ApplicationTemplate.start("World Wind Icon Picking", AppFrame.class); + ApplicationTemplate.start("WorldWind Icon Picking", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java b/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java index 81a710ce7e..f6bab33ead 100644 --- a/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java +++ b/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -29,23 +51,22 @@ * KeepingObjectsInView demonstrates keeping a set of scene elements visible by using the utility class {@link * gov.nasa.worldwindx.examples.util.ExtentVisibilitySupport}. To run this demonstration, execute this class' main * method, then follow the on-screen instructions. - *

                + *

                * The key functionality demonstrated by KeepingObjectsVisible is found in the internal classes {@link * KeepingObjectsInView.ViewController} and {@link gov.nasa.worldwindx.examples.KeepingObjectsInView.ViewAnimator}. * * @author dcollins * @version $Id: KeepingObjectsInView.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class KeepingObjectsInView extends ApplicationTemplate -{ - public static class AppFrame extends ApplicationTemplate.AppFrame - { +public class KeepingObjectsInView extends ApplicationTemplate { + + public static class AppFrame extends ApplicationTemplate.AppFrame { + protected Iterable objectsToTrack; protected ViewController viewController; protected RenderableLayer helpLayer; - public AppFrame() - { + public AppFrame() { // Create an iterable of the objects we want to keep in view. this.objectsToTrack = createObjectsToTrack(); // Set up a view controller to keep the objects in view. @@ -57,40 +78,35 @@ public AppFrame() this.initSwingComponents(); // Set up a one-shot timer to zoom to the objects once the app launches. - Timer timer = new Timer(1000, new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - enableHelpAnnotation(); - viewController.gotoScene(); - } + Timer timer = new Timer(1000, (ActionEvent e) -> { + enableHelpAnnotation(); + viewController.gotoScene(); }); timer.setRepeats(false); timer.start(); } - protected void enableHelpAnnotation() - { - if (this.helpLayer != null) + protected void enableHelpAnnotation() { + if (this.helpLayer != null) { return; + } this.helpLayer = new RenderableLayer(); this.helpLayer.addRenderable(createHelpAnnotation(getWwd())); insertBeforePlacenames(this.getWwd(), this.helpLayer); } - protected void disableHelpAnnotation() - { - if (this.helpLayer == null) + protected void disableHelpAnnotation() { + if (this.helpLayer == null) { return; + } this.getWwd().getModel().getLayers().remove(this.helpLayer); this.helpLayer.removeAllRenderables(); this.helpLayer = null; } - protected void addObjectsToWorldWindow(Iterable objectsToTrack) - { + protected void addObjectsToWorldWindow(Iterable objectsToTrack) { // Set up a layer to render the icons. Disable WWIcon view clipping, since view tracking works best when an // icon's screen rectangle is known even when the icon is outside the view frustum. IconLayer iconLayer = new IconLayer(); @@ -104,26 +120,24 @@ protected void addObjectsToWorldWindow(Iterable objectsToTrack) insertBeforePlacenames(this.getWwd(), shapesLayer); // Add the objects to track to the layers. - for (Object o : objectsToTrack) - { - if (o instanceof WWIcon) + for (Object o : objectsToTrack) { + if (o instanceof WWIcon) { iconLayer.addIcon((WWIcon) o); - else if (o instanceof Renderable) + } else if (o instanceof Renderable) { shapesLayer.addRenderable((Renderable) o); + } } // Set up a SelectListener to drag the spheres. - this.getWwd().addSelectListener(new SelectListener() - { + this.getWwd().addSelectListener(new SelectListener() { protected BasicDragger dragger = new BasicDragger(getWwd()); - public void selected(SelectEvent event) - { + @Override + public void selected(SelectEvent event) { // Delegate dragging computations to a dragger. this.dragger.selected(event); - if (event.getEventAction().equals(SelectEvent.DRAG)) - { + if (event.getEventAction().equals(SelectEvent.DRAG)) { disableHelpAnnotation(); viewController.sceneChanged(); } @@ -131,27 +145,18 @@ public void selected(SelectEvent event) }); } - protected void initSwingComponents() - { + protected void initSwingComponents() { // Create a checkbox to enable/disable the view controller. JCheckBox checkBox = new JCheckBox("Enable view tracking", true); checkBox.setAlignmentX(Component.LEFT_ALIGNMENT); - checkBox.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - boolean selected = ((AbstractButton) event.getSource()).isSelected(); - viewController.setEnabled(selected); - } + checkBox.addActionListener((ActionEvent event) -> { + boolean selected = ((AbstractButton) event.getSource()).isSelected(); + viewController.setEnabled(selected); }); JButton button = new JButton("Go to objects"); button.setAlignmentX(Component.LEFT_ALIGNMENT); - button.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - viewController.gotoScene(); - } + button.addActionListener((ActionEvent event) -> { + viewController.gotoScene(); }); Box box = Box.createVerticalBox(); box.setBorder(BorderFactory.createEmptyBorder(30, 30, 30, 30)); // top, left, bottom, right @@ -163,19 +168,17 @@ public void actionPerformed(ActionEvent event) } } - public static Iterable createObjectsToTrack() - { - ArrayList objects = new ArrayList(); + public static Iterable createObjectsToTrack() { + ArrayList objects = new ArrayList<>(); Sector sector = Sector.fromDegrees(35, 45, -110, -100); - for (int i = 0; i < 3; i++) - { + for (int i = 0; i < 3; i++) { LatLon randLocation1, randLocation2; // Add a UserFacingIcon. randLocation1 = randomLocation(sector); WWIcon icon = new UserFacingIcon("gov/nasa/worldwindx/examples/images/antenna.png", - new Position(randLocation1, 0)); + new Position(randLocation1, 0)); icon.setSize(new Dimension(64, 64)); icon.setValue(AVKey.FEEDBACK_ENABLED, Boolean.TRUE); objects.add(icon); @@ -188,18 +191,20 @@ public static Iterable createObjectsToTrack() airspace.setAttributes(new BasicAirspaceAttributes(Material.GREEN, 1d)); objects.add(airspace); - // Add a Polyline. + // Add a Path. randLocation1 = randomLocation(sector); randLocation2 = randomLocation(sector); - Polyline polyline = new Polyline(Arrays.asList(randLocation1, randLocation2), 0d); - polyline.setFollowTerrain(true); - polyline.setColor(Color.RED); - polyline.setLineWidth(3); - objects.add(polyline); + Path path = new Path(Arrays.asList(randLocation1, randLocation2), 0d); + path.setSurfacePath(true); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineWidth(3); + attrs.setOutlineMaterial(new Material(Color.RED)); + path.setAttributes(attrs); + objects.add(path); // Add a SurfaceCircle. randLocation1 = randomLocation(sector); - ShapeAttributes attrs = new BasicShapeAttributes(); + attrs = new BasicShapeAttributes(); attrs.setInteriorMaterial(Material.BLUE); attrs.setOutlineMaterial(new Material(WWUtil.makeColorBrighter(Color.BLUE))); attrs.setInteriorOpacity(0.5); @@ -210,20 +215,18 @@ public static Iterable createObjectsToTrack() return objects; } - protected static LatLon randomLocation(Sector sector) - { + protected static LatLon randomLocation(Sector sector) { return new LatLon( - Angle.mix(Math.random(), sector.getMinLatitude(), sector.getMaxLatitude()), - Angle.mix(Math.random(), sector.getMinLongitude(), sector.getMaxLongitude())); + Angle.mix(Math.random(), sector.getMinLatitude(), sector.getMaxLatitude()), + Angle.mix(Math.random(), sector.getMinLongitude(), sector.getMaxLongitude())); } - public static Annotation createHelpAnnotation(WorldWindow wwd) - { + public static Annotation createHelpAnnotation(WorldWindow wwd) { String text = "The view tracks the antenna icons," - + " the red lines," - + " the green spheres," - + " and the blue circles." - + " Drag any object out of the window to track it."; + + " the red lines," + + " the green spheres," + + " and the blue circles." + + " Drag any object out of the window to track it."; Rectangle viewport = ((Component) wwd).getBounds(); Point screenPoint = new Point(viewport.width / 2, viewport.height / 3); @@ -245,9 +248,8 @@ public static Annotation createHelpAnnotation(WorldWindow wwd) //**************************************************************// //******************** View Controller ***********************// //**************************************************************// + public static class ViewController { - public static class ViewController - { protected static final double SMOOTHING_FACTOR = 0.96; protected boolean enabled = true; @@ -255,47 +257,39 @@ public static class ViewController protected ViewAnimator animator; protected Iterable objectsToTrack; - public ViewController(WorldWindow wwd) - { + public ViewController(WorldWindow wwd) { this.wwd = wwd; } - public boolean isEnabled() - { + public boolean isEnabled() { return this.enabled; } - public void setEnabled(boolean enabled) - { + public void setEnabled(boolean enabled) { this.enabled = enabled; - if (this.animator != null) - { + if (this.animator != null) { this.animator.stop(); this.animator = null; } } - public Iterable getObjectsToTrack() - { + public Iterable getObjectsToTrack() { return this.objectsToTrack; } - public void setObjectsToTrack(Iterable iterable) - { + public void setObjectsToTrack(Iterable iterable) { this.objectsToTrack = iterable; } - public boolean isSceneContained(View view) - { + public boolean isSceneContained(View view) { ExtentVisibilitySupport vs = new ExtentVisibilitySupport(); this.addExtents(vs); return vs.areExtentsContained(view); } - public Vec4[] computeViewLookAtForScene(View view) - { + public Vec4[] computeViewLookAtForScene(View view) { Globe globe = this.wwd.getModel().getGlobe(); double ve = this.wwd.getSceneController().getVerticalExaggeration(); @@ -305,16 +299,15 @@ public Vec4[] computeViewLookAtForScene(View view) return vs.computeViewLookAtContainingExtents(globe, ve, view); } - public Position computePositionFromPoint(Vec4 point) - { + public Position computePositionFromPoint(Vec4 point) { return this.wwd.getModel().getGlobe().computePositionFromPoint(point); } - public void gotoScene() - { + public void gotoScene() { Vec4[] lookAtPoints = this.computeViewLookAtForScene(this.wwd.getView()); - if (lookAtPoints == null || lookAtPoints.length != 3) + if (lookAtPoints == null || lookAtPoints.length != 3) { return; + } Position centerPos = this.wwd.getModel().getGlobe().computePositionFromPoint(lookAtPoints[1]); double zoom = lookAtPoints[0].distanceTo3(lookAtPoints[1]); @@ -323,18 +316,18 @@ public void gotoScene() this.wwd.getView().goTo(centerPos, zoom); } - public void sceneChanged() - { + public void sceneChanged() { OrbitView view = (OrbitView) this.wwd.getView(); - if (!this.isEnabled()) + if (!this.isEnabled()) { return; + } - if (this.isSceneContained(view)) + if (this.isSceneContained(view)) { return; + } - if (this.animator == null || !this.animator.hasNext()) - { + if (this.animator == null || !this.animator.hasNext()) { this.animator = new ViewAnimator(SMOOTHING_FACTOR, view, this); this.animator.start(); view.stopAnimations(); @@ -343,52 +336,47 @@ public void sceneChanged() } } - protected void addExtents(ExtentVisibilitySupport vs) - { + protected void addExtents(ExtentVisibilitySupport vs) { // Compute screen extents for WWIcons which have feedback information from their IconRenderer. Iterable iterable = this.getObjectsToTrack(); - if (iterable == null) + if (iterable == null) { return; + } - ArrayList extentHolders = new ArrayList(); - ArrayList screenExtents = - new ArrayList(); + ArrayList extentHolders = new ArrayList<>(); + ArrayList screenExtents + = new ArrayList<>(); - for (Object o : iterable) - { - if (o == null) + for (Object o : iterable) { + if (o == null) { continue; + } - if (o instanceof ExtentHolder) - { + if (o instanceof ExtentHolder) { extentHolders.add((ExtentHolder) o); - } - else if (o instanceof AVList) - { + } else if (o instanceof AVList) { AVList avl = (AVList) o; Object b = avl.getValue(AVKey.FEEDBACK_ENABLED); - if (b == null || !Boolean.TRUE.equals(b)) + if (b == null || !Boolean.TRUE.equals(b)) { continue; + } - if (avl.getValue(AVKey.FEEDBACK_REFERENCE_POINT) != null) - { + if (avl.getValue(AVKey.FEEDBACK_REFERENCE_POINT) != null) { screenExtents.add(new ExtentVisibilitySupport.ScreenExtent( - (Vec4) avl.getValue(AVKey.FEEDBACK_REFERENCE_POINT), - (Rectangle) avl.getValue(AVKey.FEEDBACK_SCREEN_BOUNDS))); + (Vec4) avl.getValue(AVKey.FEEDBACK_REFERENCE_POINT), + (Rectangle) avl.getValue(AVKey.FEEDBACK_SCREEN_BOUNDS))); } } } - if (!extentHolders.isEmpty()) - { + if (!extentHolders.isEmpty()) { Globe globe = this.wwd.getModel().getGlobe(); double ve = this.wwd.getSceneController().getVerticalExaggeration(); vs.setExtents(ExtentVisibilitySupport.extentsFromExtentHolders(extentHolders, globe, ve)); } - if (!screenExtents.isEmpty()) - { + if (!screenExtents.isEmpty()) { vs.setScreenExtents(screenExtents); } } @@ -397,9 +385,8 @@ else if (o instanceof AVList) //**************************************************************// //******************** View Animator *************************// //**************************************************************// + public static class ViewAnimator extends BasicAnimator { - public static class ViewAnimator extends BasicAnimator - { protected static final double LOCATION_EPSILON = 1.0e-9; protected static final double ALTITUDE_EPSILON = 0.1; @@ -409,46 +396,35 @@ public static class ViewAnimator extends BasicAnimator protected Position centerPosition; protected double zoom; - public ViewAnimator(final double smoothing, OrbitView view, ViewController viewController) - { - super(new Interpolator() - { - public double nextInterpolant() - { - return 1d - smoothing; - } - }); + public ViewAnimator(final double smoothing, OrbitView view, ViewController viewController) { + super(() -> 1d - smoothing); this.view = view; this.viewController = viewController; } - public void stop() - { + @Override + public void stop() { super.stop(); this.haveTargets = false; } - protected void setImpl(double interpolant) - { + @Override + protected void setImpl(double interpolant) { this.updateTargetValues(); - if (!this.haveTargets) - { + if (!this.haveTargets) { this.stop(); return; } - if (this.valuesMeetCriteria(this.centerPosition, this.zoom)) - { + if (this.valuesMeetCriteria(this.centerPosition, this.zoom)) { this.view.setCenterPosition(this.centerPosition); this.view.setZoom(this.zoom); this.stop(); - } - else - { + } else { Position newCenterPos = Position.interpolateGreatCircle(interpolant, this.view.getCenterPosition(), - this.centerPosition); + this.centerPosition); double newZoom = WWMath.mix(interpolant, this.view.getZoom(), this.zoom); this.view.setCenterPosition(newCenterPos); this.view.setZoom(newZoom); @@ -457,37 +433,37 @@ protected void setImpl(double interpolant) this.view.firePropertyChange(AVKey.VIEW, null, this); } - protected void updateTargetValues() - { - if (this.viewController.isSceneContained(this.view)) + protected void updateTargetValues() { + if (this.viewController.isSceneContained(this.view)) { return; + } Vec4[] lookAtPoints = this.viewController.computeViewLookAtForScene(this.view); - if (lookAtPoints == null || lookAtPoints.length != 3) + if (lookAtPoints == null || lookAtPoints.length != 3) { return; + } this.centerPosition = this.viewController.computePositionFromPoint(lookAtPoints[1]); this.zoom = lookAtPoints[0].distanceTo3(lookAtPoints[1]); - if (this.zoom < view.getZoom()) + if (this.zoom < view.getZoom()) { this.zoom = view.getZoom(); + } this.haveTargets = true; } - protected boolean valuesMeetCriteria(Position centerPos, double zoom) - { + protected boolean valuesMeetCriteria(Position centerPos, double zoom) { Angle cd = LatLon.greatCircleDistance(this.view.getCenterPosition(), centerPos); double ed = Math.abs(this.view.getCenterPosition().getElevation() - centerPos.getElevation()); double zd = Math.abs(this.view.getZoom() - zoom); return cd.degrees < LOCATION_EPSILON - && ed < ALTITUDE_EPSILON - && zd < ALTITUDE_EPSILON; + && ed < ALTITUDE_EPSILON + && zd < ALTITUDE_EPSILON; } } - public static void main(String[] args) - { + public static void main(String[] args) { ApplicationTemplate.start("Keeping Objects In View", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/LayerPanel.java b/src/gov/nasa/worldwindx/examples/LayerPanel.java index 9c6c46b29d..ba0d590fd6 100644 --- a/src/gov/nasa/worldwindx/examples/LayerPanel.java +++ b/src/gov/nasa/worldwindx/examples/LayerPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/LayerTreeUsage.java b/src/gov/nasa/worldwindx/examples/LayerTreeUsage.java index 7eab3a9753..6f4350d615 100644 --- a/src/gov/nasa/worldwindx/examples/LayerTreeUsage.java +++ b/src/gov/nasa/worldwindx/examples/LayerTreeUsage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -50,7 +72,7 @@ public AppFrame() // Add a controller to handle input events on the layer tree. this.controller = new HotSpotController(this.getWwd()); - // Size the World Window to take up the space typically used by the layer panel. This illustrates the + // Size the WorldWindow to take up the space typically used by the layer panel. This illustrates the // screen space gained by using the on-screen layer tree. Dimension size = new Dimension(1000, 600); this.setPreferredSize(size); @@ -61,6 +83,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Layer Tree", AppFrame.class); + ApplicationTemplate.start("WorldWind Layer Tree", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/LineBackground.java b/src/gov/nasa/worldwindx/examples/LineBackground.java index 249b285376..bc0b070a4d 100644 --- a/src/gov/nasa/worldwindx/examples/LineBackground.java +++ b/src/gov/nasa/worldwindx/examples/LineBackground.java @@ -1,11 +1,33 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.examples; +import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.View; import gov.nasa.worldwind.geom.*; import gov.nasa.worldwind.layers.RenderableLayer; @@ -17,22 +39,19 @@ /** * Illustrates how to display lines that stand out from the background imagery. The technique is to draw behind the line * a slightly wider, slightly opaque line in a contrasting color. This backing line makes the primary line stand out - * more than it otherwise would. This example shows how to do this for both SurfacePolyline and terrain-conforming - * Polyline. + * more than it otherwise would. This example shows how to do this for both SurfacePolyline and terrain-conforming Path. * * @author tag * @version $Id: LineBackground.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class LineBackground extends ApplicationTemplate -{ - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { +public class LineBackground extends ApplicationTemplate { + + public static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, true, false); - try - { + try { // Specify attributes for the foreground line. ShapeAttributes foregroundAttrs = new BasicShapeAttributes(); foregroundAttrs.setOutlineMaterial(new Material(Color.BLUE)); @@ -46,11 +65,11 @@ public AppFrame() backgroundAttrs.setOutlineWidth(foregroundAttrs.getOutlineWidth() + 2); // Create the primary line as a SurfacePolyline and set its attributes. - SurfacePolyline si1 = new SurfacePolyline(new ArrayList(Arrays.asList( - LatLon.fromDegrees(33.7, 119.6), - LatLon.fromDegrees(33.5, 125), - LatLon.fromDegrees(35.1, 129.1), - LatLon.fromDegrees(35.8, 127.1) + SurfacePolyline si1 = new SurfacePolyline(new ArrayList<>(Arrays.asList( + LatLon.fromDegrees(33.7, 119.6), + LatLon.fromDegrees(33.5, 125), + LatLon.fromDegrees(35.1, 129.1), + LatLon.fromDegrees(35.8, 127.1) ))); si1.setClosed(true); si1.setAttributes(foregroundAttrs); @@ -61,29 +80,24 @@ public AppFrame() si2.setAttributes(backgroundAttrs); // Now do the same for the Polyline version, which is placed 2 degrees above the SurfacePolyline. - ArrayList plPoints = new ArrayList(); - for (LatLon ll : si1.getLocations()) - { + ArrayList plPoints = new ArrayList<>(); + for (LatLon ll : si1.getLocations()) { plPoints.add(ll.add(LatLon.fromDegrees(2, 0))); // add 2 degrees of latitude to separate the lines } - Polyline pl1 = new Polyline(plPoints, 0); // the primary Polyline - pl1.setFollowTerrain(true); - pl1.setClosed(true); - pl1.setPathType(Polyline.RHUMB_LINE); - pl1.setColor(foregroundAttrs.getOutlineMaterial().getDiffuse()); - pl1.setLineWidth(foregroundAttrs.getOutlineWidth()); - pl1.setStipplePattern(foregroundAttrs.getOutlineStipplePattern()); - pl1.setStippleFactor(foregroundAttrs.getOutlineStippleFactor()); + Path path1 = new Path(plPoints, 0); // the primary Path + path1.setSurfacePath(true); + path1.setPathType(AVKey.RHUMB_LINE); + path1.setAttributes(foregroundAttrs); + path1.makeClosed(); - Polyline pl2 = new Polyline(plPoints, 0); // the background Polyline - pl2.setFollowTerrain(true); - pl2.setClosed(true); - pl2.setPathType(Polyline.RHUMB_LINE); + Path path2 = new Path(plPoints, 0); // the background Path + path2.setSurfacePath(true); + path2.setPathType(AVKey.RHUMB_LINE); float[] c = backgroundAttrs.getOutlineMaterial().getDiffuse().getColorComponents(new float[3]); - pl2.setColor(new Color(c[0], c[1], c[2], (float) backgroundAttrs.getOutlineOpacity())); - pl2.setLineWidth(backgroundAttrs.getOutlineWidth()); - pl2.setStipplePattern(backgroundAttrs.getOutlineStipplePattern()); - pl2.setStippleFactor(backgroundAttrs.getOutlineStippleFactor()); + var attrs = new BasicShapeAttributes(backgroundAttrs); + attrs.setOutlineMaterial(new Material(new Color(c[0], c[1], c[2], (float) backgroundAttrs.getOutlineOpacity()))); + path2.setAttributes(attrs); + path2.makeClosed(); // Add all the lines to the scene. RenderableLayer layer = new RenderableLayer(); @@ -91,24 +105,21 @@ public AppFrame() layer.setPickEnabled(false); layer.addRenderable(si2); layer.addRenderable(si1); - layer.addRenderable(pl1); // Must draw the primary Polyline before drawing the background Polyline - layer.addRenderable(pl2); + layer.addRenderable(path1); // Must draw the primary Path before drawing the background Path + layer.addRenderable(path2); insertBeforeCompass(this.getWwd(), layer); // Move the view to the line locations. View view = getWwd().getView(); view.setEyePosition(Position.fromDegrees(35.3, 124.6, 1500e3)); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Line Backgrounds", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Line Backgrounds", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/LineBuilder.java b/src/gov/nasa/worldwindx/examples/LineBuilder.java index 654ac60008..7e4936506b 100644 --- a/src/gov/nasa/worldwindx/examples/LineBuilder.java +++ b/src/gov/nasa/worldwindx/examples/LineBuilder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -20,77 +42,69 @@ import java.util.*; /** - * A utility class to interactively build a polyline. When armed, the class monitors mouse events and adds new positions - * to a polyline as the user identifies them. The interaction sequence for creating a line is as follows:
                • Arm - * the line builder by calling its {@link #setArmed(boolean)} method with an argument of true.
                • Place the - * cursor at the first desired polyline position. Press and release mouse button one.
                • Press button one near - * the next desired position, drag the mouse to the exact position, then release the button. The proposed line segment - * will echo while the mouse is dragged. Continue selecting new positions this way until the polyline contains all - * desired positions.
                • Disarm the LineBuilder object by calling its {@link #setArmed(boolean)} - * method with an argument of false.
                - *

                + * A utility class to interactively build a path. When armed, the class monitors mouse events and adds new positions to + * a path as the user identifies them. The interaction sequence for creating a line is as follows:

                • Arm the + * line builder by calling its {@link #setArmed(boolean)} method with an argument of true.
                • Place the cursor + * at the first desired path position. Press and release mouse button one.
                • Press button one near the next + * desired position, drag the mouse to the exact position, then release the button. The proposed line segment will echo + * while the mouse is dragged. Continue selecting new positions this way until the path contains all desired positions. + *
                • Disarm the LineBuilder object by calling its {@link #setArmed(boolean)} method with an + * argument of false.
                + *

                * While the line builder is armed, pressing and immediately releasing mouse button one while also pressing the control - * key (Ctl) removes the last position from the polyline.

                - *

                + * key (Ctl) removes the last position from the path.

                + *

                * Mouse events the line builder acts on while armed are marked as consumed. These events are mouse pressed, released, * clicked and dragged. These events are not acted on while the line builder is not armed. The builder can be - * continuously armed and rearmed to allow intervening maneuvering of the globe while building a polyline. A user can - * add positions, pause entry, maneuver the view, then continue entering positions.

                - *

                + * continuously armed and rearmed to allow intervening maneuvering of the globe while building a path. A user can add + * positions, pause entry, maneuver the view, then continue entering positions.

                + *

                * Arming and disarming the line builder does not change the contents or attributes of the line builder's layer.

                - *

                - * The polyline and a layer containing it may be specified when a LineBuilder is constructed.

                - *

                + *

                + * The path and a layer containing it may be specified when a LineBuilder is constructed.

                + *

                * This class contains a main method implementing an example program illustrating use of * LineBuilder.

                * * @author tag * @version $Id: LineBuilder.java 1171 2013-02-11 21:45:02Z dcollins $ */ -public class LineBuilder extends AVListImpl -{ +public class LineBuilder extends AVListImpl { + private final WorldWindow wwd; private boolean armed = false; - private ArrayList positions = new ArrayList(); + private ArrayList positions = new ArrayList<>(); private final RenderableLayer layer; - private final Polyline line; + private final Path line; private boolean active = false; /** - * Construct a new line builder using the specified polyline and layer and drawing events from the specified world - * window. Either or both the polyline and the layer may be null, in which case the necessary object is created. + * Construct a new line builder using the specified path and layer and drawing events from the specified world + * window. Either or both the path and the layer may be null, in which case the necessary object is created. * - * @param wwd the world window to draw events from. - * @param lineLayer the layer holding the polyline. May be null, in which case a new layer is created. - * @param polyline the polyline object to build. May be null, in which case a new polyline is created. + * @param wwd the WorldWindow to draw events from. + * @param lineLayer the layer holding the path. May be null, in which case a new layer is created. + * @param path the path object to build. May be null, in which case a new path is created. */ - public LineBuilder(final WorldWindow wwd, RenderableLayer lineLayer, Polyline polyline) - { + public LineBuilder(final WorldWindow wwd, RenderableLayer lineLayer, Path path) { this.wwd = wwd; - if (polyline != null) - { - line = polyline; - } - else - { - this.line = new Polyline(); - this.line.setFollowTerrain(true); + if (path != null) { + line = path; + } else { + this.line = new Path(); + this.line.setSurfacePath(true); } this.layer = lineLayer != null ? lineLayer : new RenderableLayer(); this.layer.addRenderable(this.line); this.wwd.getModel().getLayers().add(this.layer); - this.wwd.getInputHandler().addMouseListener(new MouseAdapter() - { - public void mousePressed(MouseEvent mouseEvent) - { - if (armed && mouseEvent.getButton() == MouseEvent.BUTTON1) - { - if (armed && (mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) - { - if (!mouseEvent.isControlDown()) - { + this.wwd.getInputHandler().addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent mouseEvent) { + if (armed && mouseEvent.getButton() == MouseEvent.BUTTON1) { + if (armed && (mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) { + if (!mouseEvent.isControlDown()) { active = true; addPosition(); } @@ -99,85 +113,80 @@ public void mousePressed(MouseEvent mouseEvent) } } - public void mouseReleased(MouseEvent mouseEvent) - { - if (armed && mouseEvent.getButton() == MouseEvent.BUTTON1) - { - if (positions.size() == 1) + @Override + public void mouseReleased(MouseEvent mouseEvent) { + if (armed && mouseEvent.getButton() == MouseEvent.BUTTON1) { + if (positions.size() == 1) { removePosition(); + } active = false; mouseEvent.consume(); } } - public void mouseClicked(MouseEvent mouseEvent) - { - if (armed && mouseEvent.getButton() == MouseEvent.BUTTON1) - { - if (mouseEvent.isControlDown()) + @Override + public void mouseClicked(MouseEvent mouseEvent) { + if (armed && mouseEvent.getButton() == MouseEvent.BUTTON1) { + if (mouseEvent.isControlDown()) { removePosition(); + } mouseEvent.consume(); } } }); - this.wwd.getInputHandler().addMouseMotionListener(new MouseMotionAdapter() - { - public void mouseDragged(MouseEvent mouseEvent) - { - if (armed && (mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) - { - // Don't update the polyline here because the wwd current cursor position will not + this.wwd.getInputHandler().addMouseMotionListener(new MouseMotionAdapter() { + @Override + public void mouseDragged(MouseEvent mouseEvent) { + if (armed && (mouseEvent.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) { + // Don't update the path here because the wwd current cursor position will not // have been updated to reflect the current mouse position. Wait to update in the // position listener, but consume the event so the view doesn't respond to it. - if (active) + if (active) { mouseEvent.consume(); + } } } }); - this.wwd.addPositionListener(new PositionListener() - { - public void moved(PositionEvent event) - { - if (!active) - return; - - if (positions.size() == 1) - addPosition(); - else - replacePosition(); + this.wwd.addPositionListener((PositionEvent event) -> { + if (!active) { + return; + } + + if (positions.size() == 1) { + addPosition(); + } else { + replacePosition(); } }); } /** - * Returns the layer holding the polyline being created. + * Returns the layer holding the path being created. * - * @return the layer containing the polyline. + * @return the layer containing the path. */ - public RenderableLayer getLayer() - { + public RenderableLayer getLayer() { return this.layer; } /** - * Returns the layer currently used to display the polyline. + * Returns the layer currently used to display the path. * - * @return the layer holding the polyline. + * @return the layer holding the path. */ - public Polyline getLine() - { + public Path getLine() { return this.line; } /** - * Removes all positions from the polyline. + * Removes all positions from the path. */ - public void clear() - { - while (this.positions.size() > 0) + public void clear() { + while (this.positions.size() > 0) { this.removePosition(); + } } /** @@ -185,27 +194,25 @@ public void clear() * * @return true if armed, false if not armed. */ - public boolean isArmed() - { + public boolean isArmed() { return this.armed; } /** - * Arms and disarms the line builder. When armed, the line builder monitors user input and builds the polyline in + * Arms and disarms the line builder. When armed, the line builder monitors user input and builds the path in * response to the actions mentioned in the overview above. When disarmed, the line builder ignores all user input. * * @param armed true to arm the line builder, false to disarm it. */ - public void setArmed(boolean armed) - { + public void setArmed(boolean armed) { this.armed = armed; } - private void addPosition() - { + private void addPosition() { Position curPos = this.wwd.getCurrentPosition(); - if (curPos == null) + if (curPos == null) { return; + } this.positions.add(curPos); this.line.setPositions(this.positions); @@ -213,15 +220,16 @@ private void addPosition() this.wwd.redraw(); } - private void replacePosition() - { + private void replacePosition() { Position curPos = this.wwd.getCurrentPosition(); - if (curPos == null) + if (curPos == null) { return; + } int index = this.positions.size() - 1; - if (index < 0) + if (index < 0) { index = 0; + } Position currentLastPosition = this.positions.get(index); this.positions.set(index, curPos); @@ -230,10 +238,10 @@ private void replacePosition() this.wwd.redraw(); } - private void removePosition() - { - if (this.positions.size() == 0) + private void removePosition() { + if (this.positions.isEmpty()) { return; + } Position currentLastPosition = this.positions.get(this.positions.size() - 1); this.positions.remove(this.positions.size() - 1); @@ -245,9 +253,8 @@ private void removePosition() // ===================== Control Panel ======================= // // The following code is an example program illustrating LineBuilder usage. It is not required by the // LineBuilder class, itself. + private static class LinePanel extends JPanel { - private static class LinePanel extends JPanel - { private final WorldWindow wwd; private final LineBuilder lineBuilder; private JButton newButton; @@ -255,66 +262,48 @@ private static class LinePanel extends JPanel private JButton endButton; private JLabel[] pointLabels; - public LinePanel(WorldWindow wwd, LineBuilder lineBuilder) - { + public LinePanel(WorldWindow wwd, LineBuilder lineBuilder) { super(new BorderLayout()); this.wwd = wwd; this.lineBuilder = lineBuilder; this.makePanel(new Dimension(200, 400)); - lineBuilder.addPropertyChangeListener(new PropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent propertyChangeEvent) - { - fillPointsPanel(); - } + lineBuilder.addPropertyChangeListener((PropertyChangeEvent propertyChangeEvent) -> { + fillPointsPanel(); }); } - private void makePanel(Dimension size) - { + private void makePanel(Dimension size) { JPanel buttonPanel = new JPanel(new GridLayout(1, 2, 5, 5)); newButton = new JButton("New"); - newButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - lineBuilder.clear(); - lineBuilder.setArmed(true); - pauseButton.setText("Pause"); - pauseButton.setEnabled(true); - endButton.setEnabled(true); - newButton.setEnabled(false); - ((Component) wwd).setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); - } + newButton.addActionListener((ActionEvent actionEvent) -> { + lineBuilder.clear(); + lineBuilder.setArmed(true); + pauseButton.setText("Pause"); + pauseButton.setEnabled(true); + endButton.setEnabled(true); + newButton.setEnabled(false); + ((Component) wwd).setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); }); buttonPanel.add(newButton); newButton.setEnabled(true); pauseButton = new JButton("Pause"); - pauseButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - lineBuilder.setArmed(!lineBuilder.isArmed()); - pauseButton.setText(!lineBuilder.isArmed() ? "Resume" : "Pause"); - ((Component) wwd).setCursor(Cursor.getDefaultCursor()); - } + pauseButton.addActionListener((ActionEvent actionEvent) -> { + lineBuilder.setArmed(!lineBuilder.isArmed()); + pauseButton.setText(!lineBuilder.isArmed() ? "Resume" : "Pause"); + ((Component) wwd).setCursor(Cursor.getDefaultCursor()); }); buttonPanel.add(pauseButton); pauseButton.setEnabled(false); endButton = new JButton("End"); - endButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - lineBuilder.setArmed(false); - newButton.setEnabled(true); - pauseButton.setEnabled(false); - pauseButton.setText("Pause"); - endButton.setEnabled(false); - ((Component) wwd).setCursor(Cursor.getDefaultCursor()); - } + endButton.addActionListener((ActionEvent actionEvent) -> { + lineBuilder.setArmed(false); + newButton.setEnabled(true); + pauseButton.setEnabled(false); + pauseButton.setText("Pause"); + endButton.setEnabled(false); + ((Component) wwd).setCursor(Cursor.getDefaultCursor()); }); buttonPanel.add(endButton); endButton.setEnabled(false); @@ -323,8 +312,7 @@ public void actionPerformed(ActionEvent actionEvent) pointPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); this.pointLabels = new JLabel[20]; - for (int i = 0; i < this.pointLabels.length; i++) - { + for (int i = 0; i < this.pointLabels.length; i++) { this.pointLabels[i] = new JLabel(""); pointPanel.add(this.pointLabels[i]); } @@ -336,33 +324,34 @@ public void actionPerformed(ActionEvent actionEvent) // Put the point panel in a scroll bar. JScrollPane scrollPane = new JScrollPane(dummyPanel); scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - if (size != null) + if (size != null) { scrollPane.setPreferredSize(size); + } // Add the buttons, scroll bar and inner panel to a titled panel that will resize with the main window. JPanel outerPanel = new JPanel(new BorderLayout()); outerPanel.setBorder( - new CompoundBorder(BorderFactory.createEmptyBorder(9, 9, 9, 9), new TitledBorder("Line"))); + new CompoundBorder(BorderFactory.createEmptyBorder(9, 9, 9, 9), new TitledBorder("Line"))); outerPanel.setToolTipText("Line control and info"); outerPanel.add(buttonPanel, BorderLayout.NORTH); outerPanel.add(scrollPane, BorderLayout.CENTER); this.add(outerPanel, BorderLayout.CENTER); } - private void fillPointsPanel() - { + private void fillPointsPanel() { int i = 0; - for (Position pos : lineBuilder.getLine().getPositions()) - { - if (i == this.pointLabels.length) + for (Position pos : lineBuilder.getLine().getPositions()) { + if (i == this.pointLabels.length) { break; + } String las = String.format("Lat %7.4f\u00B0", pos.getLatitude().getDegrees()); String los = String.format("Lon %7.4f\u00B0", pos.getLongitude().getDegrees()); pointLabels[i++].setText(las + " " + los); } - for (; i < this.pointLabels.length; i++) + for (; i < this.pointLabels.length; i++) { pointLabels[i++].setText(""); + } } } @@ -371,10 +360,10 @@ private void fillPointsPanel() * * @deprecated */ - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { + @Deprecated + public static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, false, false); LineBuilder lineBuilder = new LineBuilder(this.getWwd(), null, null); @@ -382,15 +371,8 @@ public AppFrame() } } - /** - * Marked as deprecated to keep it out of the javadoc. - * - * @param args the arguments passed to the program. - * @deprecated - */ - public static void main(String[] args) - { + public static void main(String[] args) { //noinspection deprecation - ApplicationTemplate.start("World Wind Line Builder", LineBuilder.AppFrame.class); + ApplicationTemplate.start("WorldWind Line Builder", LineBuilder.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/LocalDataOnly.java b/src/gov/nasa/worldwindx/examples/LocalDataOnly.java index 638f01103e..135c59cd7c 100644 --- a/src/gov/nasa/worldwindx/examples/LocalDataOnly.java +++ b/src/gov/nasa/worldwindx/examples/LocalDataOnly.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -31,7 +53,7 @@ public static void main(String[] args) { ApplicationTemplate.start("Local Data Only", AppFrame.class); - // Force World Wind not to use the network + // Force WorldWind not to use the network WorldWind.getNetworkStatus().setOfflineMode(true); } } diff --git a/src/gov/nasa/worldwindx/examples/LoggingControl.java b/src/gov/nasa/worldwindx/examples/LoggingControl.java index 4ff9cf2eea..90a043565f 100644 --- a/src/gov/nasa/worldwindx/examples/LoggingControl.java +++ b/src/gov/nasa/worldwindx/examples/LoggingControl.java @@ -1,21 +1,43 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; import java.util.logging.*; /** - * Illustrate control and redirection of World Wind logging. + * Illustrate control and redirection of WorldWind logging. * * @author tag * @version $Id: LoggingControl.java 1171 2013-02-11 21:45:02Z dcollins $ */ public class LoggingControl extends ApplicationTemplate { - // Use the standard World Wind application template + // Use the standard WorldWind application template private static class AppFrame extends ApplicationTemplate.AppFrame { public AppFrame() @@ -26,10 +48,10 @@ public AppFrame() public static void main(String[] args) { - // Get the World Wind logger by name. + // Get the WorldWind logger by name. Logger logger = Logger.getLogger("gov.nasa.worldwind"); - // Turn off logging to parent handlers of the World Wind handler. + // Turn off logging to parent handlers of the WorldWind handler. logger.setUseParentHandlers(false); // Create a console handler (defined below) that we use to write log messages. @@ -43,7 +65,7 @@ public static void main(String[] args) logger.addHandler(handler); // Start the application. - ApplicationTemplate.start("World Wind Logging Control", AppFrame.class); + ApplicationTemplate.start("WorldWind Logging Control", AppFrame.class); } private static class MyHandler extends ConsoleHandler diff --git a/src/gov/nasa/worldwindx/examples/MGRSAttributesPanel.java b/src/gov/nasa/worldwindx/examples/MGRSAttributesPanel.java index 06afecda78..7b7e62e472 100644 --- a/src/gov/nasa/worldwindx/examples/MGRSAttributesPanel.java +++ b/src/gov/nasa/worldwindx/examples/MGRSAttributesPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/MGRSGraticule.java b/src/gov/nasa/worldwindx/examples/MGRSGraticule.java index 7e71284f3e..0b1da1b6f5 100644 --- a/src/gov/nasa/worldwindx/examples/MGRSGraticule.java +++ b/src/gov/nasa/worldwindx/examples/MGRSGraticule.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -53,6 +75,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind UTM/MGRS Graticule", AppFrame.class); + ApplicationTemplate.start("WorldWind UTM/MGRS Graticule", AppFrame.class); } } \ No newline at end of file diff --git a/src/gov/nasa/worldwindx/examples/Markers.java b/src/gov/nasa/worldwindx/examples/Markers.java index aafb0060b8..445b02b972 100644 --- a/src/gov/nasa/worldwindx/examples/Markers.java +++ b/src/gov/nasa/worldwindx/examples/Markers.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -133,6 +155,6 @@ public void selected(SelectEvent event) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Markers", AppFrame.class); + ApplicationTemplate.start("WorldWind Markers", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/MarkersOrder.java b/src/gov/nasa/worldwindx/examples/MarkersOrder.java index 62842129a1..b4d4c87399 100644 --- a/src/gov/nasa/worldwindx/examples/MarkersOrder.java +++ b/src/gov/nasa/worldwindx/examples/MarkersOrder.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -558,6 +580,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LATITUDE, TRACK_LATITUDE); Configuration.setValue(AVKey.INITIAL_LONGITUDE, TRACK_LONGITUDE); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 40e3); - ApplicationTemplate.start("World Wind Markers Order", AppFrame.class); + ApplicationTemplate.start("WorldWind Markers Order", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/MeasureToolPanel.java b/src/gov/nasa/worldwindx/examples/MeasureToolPanel.java index 50ed4f77f1..f0ea5f9236 100644 --- a/src/gov/nasa/worldwindx/examples/MeasureToolPanel.java +++ b/src/gov/nasa/worldwindx/examples/MeasureToolPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -20,15 +42,14 @@ import java.util.ArrayList; /** -* Control panel for the MeasureTool. -* -* @author Patrick Murris -* @version $Id: MeasureToolPanel.java 2226 2014-08-14 15:56:45Z tgaskins $ -* @see gov.nasa.worldwind.util.measure.MeasureTool -*/ -@SuppressWarnings("unchecked") -public class MeasureToolPanel extends JPanel -{ + * Control panel for the MeasureTool. + * + * @author Patrick Murris + * @version $Id: MeasureToolPanel.java 2226 2014-08-14 15:56:45Z tgaskins $ + * @see gov.nasa.worldwind.util.measure.MeasureTool + */ +public class MeasureToolPanel extends JPanel { + private final WorldWindow wwd; private final MeasureTool measureTool; @@ -55,11 +76,11 @@ public class MeasureToolPanel extends JPanel private JLabel headingLabel; private JLabel centerLabel; - private static ArrayList LINE = new ArrayList(); - private static ArrayList PATH = new ArrayList(); - private static ArrayList POLYGON = new ArrayList(); - static - { + private static final ArrayList LINE = new ArrayList<>(); + private static final ArrayList PATH = new ArrayList<>(); + private static final ArrayList POLYGON = new ArrayList<>(); + + static { LINE.add(Position.fromDegrees(44, 7, 0)); LINE.add(Position.fromDegrees(45, 8, 0)); @@ -72,89 +93,78 @@ public class MeasureToolPanel extends JPanel POLYGON.add(Position.fromDegrees(44, 7, 0)); } - public MeasureToolPanel(WorldWindow wwdObject, MeasureTool measureToolObject) - { + public MeasureToolPanel(WorldWindow wwdObject, MeasureTool measureToolObject) { super(new BorderLayout()); this.wwd = wwdObject; this.measureTool = measureToolObject; this.makePanel(new Dimension(200, 300)); // Handle measure tool events - measureTool.addPropertyChangeListener(new PropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent event) - { - // Add, remove or change positions - if (event.getPropertyName().equals(MeasureTool.EVENT_POSITION_ADD) - || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REMOVE) - || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REPLACE)) - fillPointsPanel(); // Update position list when changed - - // The tool was armed / disarmed - else if(event.getPropertyName().equals(MeasureTool.EVENT_ARMED)) - { - if (measureTool.isArmed()) - { - newButton.setEnabled(false); - pauseButton.setText("Pause"); - pauseButton.setEnabled(true); - endButton.setEnabled(true); - ((Component) wwd).setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); - } - else - { - newButton.setEnabled(true); - pauseButton.setText("Pause"); - pauseButton.setEnabled(false); - endButton.setEnabled(false); - ((Component) wwd).setCursor(Cursor.getDefaultCursor()); - } - - } - - // Metric changed - sent after each render frame - else if(event.getPropertyName().equals(MeasureTool.EVENT_METRIC_CHANGED)) - { - updateMetric(); + measureTool.addPropertyChangeListener((PropertyChangeEvent event) -> { + // Add, remove or change positions + if (event.getPropertyName().equals(MeasureTool.EVENT_POSITION_ADD) + || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REMOVE) + || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REPLACE)) { + fillPointsPanel(); // Update position list when changed + } // The tool was armed / disarmed + else if (event.getPropertyName().equals(MeasureTool.EVENT_ARMED)) { + if (measureTool.isArmed()) { + newButton.setEnabled(false); + pauseButton.setText("Pause"); + pauseButton.setEnabled(true); + endButton.setEnabled(true); + ((Component) wwd).setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); + } else { + newButton.setEnabled(true); + pauseButton.setText("Pause"); + pauseButton.setEnabled(false); + endButton.setEnabled(false); + ((Component) wwd).setCursor(Cursor.getDefaultCursor()); } + } // Metric changed - sent after each render frame + else if (event.getPropertyName().equals(MeasureTool.EVENT_METRIC_CHANGED)) { + updateMetric(); } }); } - public MeasureTool getMeasureTool() - { + public MeasureTool getMeasureTool() { return this.measureTool; } - private void makePanel(Dimension size) - { + private void makePanel(Dimension size) { // Shape combo JPanel shapePanel = new JPanel(new GridLayout(1, 2, 5, 5)); shapePanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); shapePanel.add(new JLabel("Shape:")); - shapeCombo = new JComboBox(new String[] - {"Line", "Path", "Polygon", "Circle", "Ellipse", "Square", "Rectangle"}); - shapeCombo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - String item = (String)((JComboBox)event.getSource()).getSelectedItem(); - if (item.equals("Line") ) + shapeCombo = new JComboBox<>(new String[]{"Line", "Path", "Polygon", "Circle", "Ellipse", "Square", "Rectangle"}); + shapeCombo.addActionListener((ActionEvent event) -> { + String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); + switch (item) { + case "Line": measureTool.setMeasureShapeType(MeasureTool.SHAPE_LINE); - else if (item.equals("Path")) + break; + case "Path": measureTool.setMeasureShapeType(MeasureTool.SHAPE_PATH); - else if (item.equals("Polygon")) + break; + case "Polygon": measureTool.setMeasureShapeType(MeasureTool.SHAPE_POLYGON); - else if (item.equals("Circle")) + break; + case "Circle": measureTool.setMeasureShapeType(MeasureTool.SHAPE_CIRCLE); - else if (item.equals("Ellipse")) + break; + case "Ellipse": measureTool.setMeasureShapeType(MeasureTool.SHAPE_ELLIPSE); - else if (item.equals("Square")) + break; + case "Square": measureTool.setMeasureShapeType(MeasureTool.SHAPE_SQUARE); - else if (item.equals("Rectangle")) + break; + case "Rectangle": measureTool.setMeasureShapeType(MeasureTool.SHAPE_QUAD); - + break; + default: + break; } }); shapePanel.add(shapeCombo); @@ -163,19 +173,22 @@ else if (item.equals("Rectangle")) JPanel pathTypePanel = new JPanel(new GridLayout(1, 2, 5, 5)); pathTypePanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); pathTypePanel.add(new JLabel("Path type:")); - pathTypeCombo = new JComboBox(new String[] {"Linear", "Rhumb", "Great circle"}); + pathTypeCombo = new JComboBox<>(new String[]{"Linear", "Rhumb", "Great circle"}); pathTypeCombo.setSelectedIndex(2); - pathTypeCombo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - String item = (String)((JComboBox)event.getSource()).getSelectedItem(); - if (item.equals("Linear") ) + pathTypeCombo.addActionListener((ActionEvent event) -> { + String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); + switch (item) { + case "Linear": measureTool.setPathType(AVKey.LINEAR); - else if (item.equals("Rhumb")) + break; + case "Rhumb": measureTool.setPathType(AVKey.RHUMB_LINE); - else if (item.equals("Great circle")) + break; + case "Great circle": measureTool.setPathType(AVKey.GREAT_CIRCLE); + break; + default: + break; } }); pathTypePanel.add(pathTypeCombo); @@ -184,49 +197,42 @@ else if (item.equals("Great circle")) JPanel unitsPanel = new JPanel(new GridLayout(1, 2, 5, 5)); unitsPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); unitsPanel.add(new JLabel("Units:")); - unitsCombo = new JComboBox(new String[] {"M/M\u00b2", "KM/KM\u00b2", "KM/Hectare", "Feet/Feet\u00b2", + unitsCombo = new JComboBox<>(new String[]{"M/M\u00b2", "KM/KM\u00b2", "KM/Hectare", "Feet/Feet\u00b2", "Miles/Miles\u00b2", "Nm/Miles\u00b2", "Yards/Acres"}); unitsCombo.setSelectedItem("KM/KM\u00b2"); - unitsCombo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - String item = (String)((JComboBox)event.getSource()).getSelectedItem(); - if (item.equals("M/M\u00b2")) - { + unitsCombo.addActionListener((ActionEvent event) -> { + String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); + switch (item) { + case "M/M\u00b2": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.METERS); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.SQUARE_METERS); - } - else if (item.equals("KM/KM\u00b2")) - { + break; + case "KM/KM\u00b2": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.KILOMETERS); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.SQUARE_KILOMETERS); - } - else if (item.equals("KM/Hectare")) - { + break; + case "KM/Hectare": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.KILOMETERS); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.HECTARE); - } - else if (item.equals("Feet/Feet\u00b2")) - { + break; + case "Feet/Feet\u00b2": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.FEET); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.SQUARE_FEET); - } - else if (item.equals("Miles/Miles\u00b2")) - { + break; + case "Miles/Miles\u00b2": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.MILES); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.SQUARE_MILES); - } - else if (item.equals("Nm/Miles\u00b2")) - { + break; + case "Nm/Miles\u00b2": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.NAUTICAL_MILES); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.SQUARE_MILES); - } - else if (item.equals("Yards/Acres")) - { + break; + case "Yards/Acres": measureTool.getUnitsFormat().setLengthUnits(UnitsFormat.YARDS); measureTool.getUnitsFormat().setAreaUnits(UnitsFormat.ACRE); - } + break; + default: + break; } }); unitsPanel.add(unitsCombo); @@ -235,15 +241,11 @@ else if (item.equals("Yards/Acres")) JPanel anglesPanel = new JPanel(new GridLayout(1, 2, 5, 5)); anglesPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); anglesPanel.add(new JLabel("Angle Format:")); - anglesCombo = new JComboBox(new String[] {"DD", "DMS"}); + anglesCombo = new JComboBox<>(new String[]{"DD", "DMS"}); anglesCombo.setSelectedItem("DD"); - anglesCombo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - String item = (String)((JComboBox)event.getSource()).getSelectedItem(); - measureTool.getUnitsFormat().setShowDMS(item.equals("DMS")); - } + anglesCombo.addActionListener((ActionEvent event) -> { + String item = (String) ((JComboBox) event.getSource()).getSelectedItem(); + measureTool.getUnitsFormat().setShowDMS(item.equals("DMS")); }); anglesPanel.add(anglesCombo); @@ -253,67 +255,47 @@ public void actionPerformed(ActionEvent event) followCheck = new JCheckBox("Follow terrain"); followCheck.setSelected(measureTool.isFollowTerrain()); - followCheck.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - JCheckBox cb = (JCheckBox)event.getSource(); - measureTool.setFollowTerrain(cb.isSelected()); - wwd.redraw(); - } + followCheck.addActionListener((ActionEvent event) -> { + JCheckBox cb = (JCheckBox) event.getSource(); + measureTool.setFollowTerrain(cb.isSelected()); + wwd.redraw(); }); checkPanel.add(followCheck); showControlsCheck = new JCheckBox("Control points"); showControlsCheck.setSelected(measureTool.isShowControlPoints()); - showControlsCheck.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - JCheckBox cb = (JCheckBox)event.getSource(); - measureTool.setShowControlPoints(cb.isSelected()); - wwd.redraw(); - } + showControlsCheck.addActionListener((ActionEvent event) -> { + JCheckBox cb = (JCheckBox) event.getSource(); + measureTool.setShowControlPoints(cb.isSelected()); + wwd.redraw(); }); checkPanel.add(showControlsCheck); rubberBandCheck = new JCheckBox("Rubber band"); rubberBandCheck.setSelected(measureTool.getController().isUseRubberBand()); - rubberBandCheck.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - JCheckBox cb = (JCheckBox)event.getSource(); - measureTool.getController().setUseRubberBand(cb.isSelected()); - freeHandCheck.setEnabled(cb.isSelected()); - wwd.redraw(); - } + rubberBandCheck.addActionListener((ActionEvent event) -> { + JCheckBox cb = (JCheckBox) event.getSource(); + measureTool.getController().setUseRubberBand(cb.isSelected()); + freeHandCheck.setEnabled(cb.isSelected()); + wwd.redraw(); }); checkPanel.add(rubberBandCheck); freeHandCheck = new JCheckBox("Free Hand"); freeHandCheck.setSelected(measureTool.getController().isFreeHand()); - freeHandCheck.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - JCheckBox cb = (JCheckBox)event.getSource(); - measureTool.getController().setFreeHand(cb.isSelected()); - wwd.redraw(); - } + freeHandCheck.addActionListener((ActionEvent event) -> { + JCheckBox cb = (JCheckBox) event.getSource(); + measureTool.getController().setFreeHand(cb.isSelected()); + wwd.redraw(); }); checkPanel.add(freeHandCheck); showAnnotationCheck = new JCheckBox("Tooltip"); showAnnotationCheck.setSelected(measureTool.isShowAnnotation()); - showAnnotationCheck.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - JCheckBox cb = (JCheckBox)event.getSource(); - measureTool.setShowAnnotation(cb.isSelected()); - wwd.redraw(); - } + showAnnotationCheck.addActionListener((ActionEvent event) -> { + JCheckBox cb = (JCheckBox) event.getSource(); + measureTool.setShowAnnotation(cb.isSelected()); + wwd.redraw(); }); checkPanel.add(showAnnotationCheck); @@ -321,54 +303,39 @@ public void actionPerformed(ActionEvent event) final JPanel colorPanel = new JPanel(new GridLayout(1, 2, 5, 5)); colorPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); lineColorButton = new JButton("Line"); - lineColorButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - Color c = JColorChooser.showDialog(colorPanel, - "Choose a color...", ((JButton)event.getSource()).getBackground()); - if (c != null) - { - ((JButton)event.getSource()).setBackground(c); - measureTool.setLineColor(c); - Color fill = new Color(c.getRed() / 255f * .5f, - c.getGreen() / 255f * .5f, c.getBlue() / 255f * .5f, .5f); - measureTool.setFillColor(fill); - } + lineColorButton.addActionListener((ActionEvent event) -> { + Color c = JColorChooser.showDialog(colorPanel, + "Choose a color...", ((JButton) event.getSource()).getBackground()); + if (c != null) { + ((JButton) event.getSource()).setBackground(c); + measureTool.setLineColor(c); + Color fill = new Color(c.getRed() / 255f * .5f, + c.getGreen() / 255f * .5f, c.getBlue() / 255f * .5f, .5f); + measureTool.setFillColor(fill); } }); colorPanel.add(lineColorButton); lineColorButton.setBackground(measureTool.getLineColor()); pointColorButton = new JButton("Points"); - pointColorButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - Color c = JColorChooser.showDialog(colorPanel, - "Choose a color...", ((JButton)event.getSource()).getBackground()); - if (c != null) - { - ((JButton)event.getSource()).setBackground(c); - measureTool.getControlPointsAttributes().setBackgroundColor(c); - } + pointColorButton.addActionListener((ActionEvent event) -> { + Color c = JColorChooser.showDialog(colorPanel, + "Choose a color...", ((JButton) event.getSource()).getBackground()); + if (c != null) { + ((JButton) event.getSource()).setBackground(c); + measureTool.getControlPointsAttributes().setBackgroundColor(c); } }); colorPanel.add(pointColorButton); pointColorButton.setBackground(measureTool.getControlPointsAttributes().getBackgroundColor()); annotationColorButton = new JButton("Tooltip"); - annotationColorButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent event) - { - Color c = JColorChooser.showDialog(colorPanel, - "Choose a color...", ((JButton)event.getSource()).getBackground()); - if (c != null) - { - ((JButton)event.getSource()).setBackground(c); - measureTool.getAnnotationAttributes().setTextColor(c); - } + annotationColorButton.addActionListener((ActionEvent event) -> { + Color c = JColorChooser.showDialog(colorPanel, + "Choose a color...", ((JButton) event.getSource()).getBackground()); + if (c != null) { + ((JButton) event.getSource()).setBackground(c); + measureTool.getAnnotationAttributes().setTextColor(c); } }); annotationColorButton.setBackground(measureTool.getAnnotationAttributes().getTextColor()); @@ -378,39 +345,27 @@ public void actionPerformed(ActionEvent event) JPanel buttonPanel = new JPanel(new GridLayout(1, 2, 5, 5)); buttonPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); newButton = new JButton("New"); - newButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - measureTool.clear(); - measureTool.setArmed(true); - } + newButton.addActionListener((ActionEvent actionEvent) -> { + measureTool.clear(); + measureTool.setArmed(true); }); buttonPanel.add(newButton); newButton.setEnabled(true); pauseButton = new JButton("Pause"); - pauseButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - measureTool.setArmed(!measureTool.isArmed()); - pauseButton.setText(!measureTool.isArmed() ? "Resume" : "Pause"); - pauseButton.setEnabled(true); - ((Component) wwd).setCursor(!measureTool.isArmed() ? Cursor.getDefaultCursor() - : Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); - } + pauseButton.addActionListener((ActionEvent actionEvent) -> { + measureTool.setArmed(!measureTool.isArmed()); + pauseButton.setText(!measureTool.isArmed() ? "Resume" : "Pause"); + pauseButton.setEnabled(true); + ((Component) wwd).setCursor(!measureTool.isArmed() ? Cursor.getDefaultCursor() + : Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); }); buttonPanel.add(pauseButton); pauseButton.setEnabled(false); endButton = new JButton("End"); - endButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - measureTool.setArmed(false); - } + endButton.addActionListener((ActionEvent actionEvent) -> { + measureTool.setArmed(false); }); buttonPanel.add(endButton); endButton.setEnabled(false); @@ -419,44 +374,30 @@ public void actionPerformed(ActionEvent actionEvent) JPanel presetPanel = new JPanel(new GridLayout(1, 2, 5, 5)); presetPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); JButton bt = new JButton("Polyline"); - bt.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - shapeCombo.setSelectedIndex(1); - measureTool.setMeasureShape(new Polyline(PATH)); - } + bt.addActionListener((ActionEvent actionEvent) -> { + shapeCombo.setSelectedIndex(1); + measureTool.setMeasureShape(new Path(PATH)); }); presetPanel.add(bt); bt = new JButton("Surf. Quad"); - bt.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - shapeCombo.setSelectedIndex(6); - measureTool.setMeasureShape(new SurfaceQuad(Position.fromDegrees(44, 7, 0), 100e3, 50e3, Angle.fromDegrees(30))); - } + bt.addActionListener((ActionEvent actionEvent) -> { + shapeCombo.setSelectedIndex(6); + measureTool.setMeasureShape(new SurfaceQuad(Position.fromDegrees(44, 7, 0), 100e3, 50e3, Angle.fromDegrees(30))); }); presetPanel.add(bt); bt = new JButton("Polygon"); - bt.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - shapeCombo.setSelectedIndex(2); - measureTool.setMeasureShape(new SurfacePolygon(POLYGON)); - } + bt.addActionListener((ActionEvent actionEvent) -> { + shapeCombo.setSelectedIndex(2); + measureTool.setMeasureShape(new SurfacePolygon(POLYGON)); }); presetPanel.add(bt); - // Point list JPanel pointPanel = new JPanel(new GridLayout(0, 1, 0, 4)); pointPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); this.pointLabels = new JLabel[100]; - for (int i = 0; i < this.pointLabels.length; i++) - { + for (int i = 0; i < this.pointLabels.length; i++) { this.pointLabels[i] = new JLabel(""); pointPanel.add(this.pointLabels[i]); } @@ -468,12 +409,13 @@ public void actionPerformed(ActionEvent actionEvent) // Put the point panel in a scroll bar. JScrollPane scrollPane = new JScrollPane(dummyPanel); scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - if (size != null) + if (size != null) { scrollPane.setPreferredSize(size); + } // Metric JPanel metricPanel = new JPanel(new GridLayout(0, 2, 0, 4)); - metricPanel.setBorder( new CompoundBorder( + metricPanel.setBorder(new CompoundBorder( new TitledBorder("Metric"), BorderFactory.createEmptyBorder(5, 5, 5, 5))); metricPanel.add(new JLabel("Length:")); lengthLabel = new JLabel(); @@ -494,12 +436,11 @@ public void actionPerformed(ActionEvent actionEvent) centerLabel = new JLabel(); metricPanel.add(centerLabel); - // Add all the panels to a titled panel JPanel outerPanel = new JPanel(); outerPanel.setLayout(new BoxLayout(outerPanel, BoxLayout.Y_AXIS)); outerPanel.setBorder( - new CompoundBorder(BorderFactory.createEmptyBorder(9, 9, 9, 9), new TitledBorder("Measure"))); + new CompoundBorder(BorderFactory.createEmptyBorder(9, 9, 9, 9), new TitledBorder("Measure"))); outerPanel.setToolTipText("Measure tool control and info"); outerPanel.add(colorPanel); outerPanel.add(shapePanel); @@ -515,15 +456,13 @@ public void actionPerformed(ActionEvent actionEvent) this.add(outerPanel, BorderLayout.NORTH); } - private void fillPointsPanel() - { + private void fillPointsPanel() { int i = 0; - if (measureTool.getPositions() != null) - { - for (LatLon pos : measureTool.getPositions()) - { - if (i == this.pointLabels.length) + if (measureTool.getPositions() != null) { + for (LatLon pos : measureTool.getPositions()) { + if (i == this.pointLabels.length) { break; + } String las = String.format("Lat %7.4f\u00B0", pos.getLatitude().getDegrees()); String los = String.format("Lon %7.4f\u00B0", pos.getLongitude().getDegrees()); @@ -531,68 +470,74 @@ private void fillPointsPanel() } } // Clear remaining labels - for (; i < this.pointLabels.length; i++) + for (; i < this.pointLabels.length; i++) { pointLabels[i].setText(""); + } } - private void updateMetric() - { + private void updateMetric() { // Update length label double value = measureTool.getLength(); String s; - if (value <= 0) + if (value <= 0) { s = "na"; - else if(value < 1000) + } else if (value < 1000) { s = String.format("%,7.1f m", value); - else + } else { s = String.format("%,7.3f km", value / 1000); + } lengthLabel.setText(s); // Update area label value = measureTool.getArea(); - if (value < 0) + if (value < 0) { s = "na"; - else if(value < 1e6) + } else if (value < 1e6) { s = String.format("%,7.1f m2", value); - else + } else { s = String.format("%,7.3f km2", value / 1e6); + } areaLabel.setText(s); // Update width label value = measureTool.getWidth(); - if (value < 0) + if (value < 0) { s = "na"; - else if(value < 1000) + } else if (value < 1000) { s = String.format("%,7.1f m", value); - else + } else { s = String.format("%,7.3f km", value / 1000); + } widthLabel.setText(s); // Update height label value = measureTool.getHeight(); - if (value < 0) + if (value < 0) { s = "na"; - else if(value < 1000) + } else if (value < 1000) { s = String.format("%,7.1f m", value); - else + } else { s = String.format("%,7.3f km", value / 1000); + } heightLabel.setText(s); // Update heading label Angle angle = measureTool.getOrientation(); - if(angle != null) + if (angle != null) { s = String.format("%,6.2f\u00B0", angle.degrees); - else + } else { s = "na"; + } headingLabel.setText(s); // Update center label Position center = measureTool.getCenterPosition(); - if(center != null) + if (center != null) { s = String.format("%,7.4f\u00B0 %,7.4f\u00B0", center.getLatitude().degrees, center.getLongitude().degrees); - else + } else { s = "na"; + } centerLabel.setText(s); } } diff --git a/src/gov/nasa/worldwindx/examples/MeasureToolUsage.java b/src/gov/nasa/worldwindx/examples/MeasureToolUsage.java index 0b043a5846..ebfe2a038c 100644 --- a/src/gov/nasa/worldwindx/examples/MeasureToolUsage.java +++ b/src/gov/nasa/worldwindx/examples/MeasureToolUsage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -25,17 +47,16 @@ * @see gov.nasa.worldwind.util.measure.MeasureToolController * @see MeasureToolPanel */ -public class MeasureToolUsage extends ApplicationTemplate -{ - public static class AppFrame extends ApplicationTemplate.AppFrame - { +public class MeasureToolUsage extends ApplicationTemplate { + + public static class AppFrame extends ApplicationTemplate.AppFrame { + private int lastTabIndex = -1; private final JTabbedPane tabbedPane = new JTabbedPane(); - private TerrainProfileLayer profile = new TerrainProfileLayer(); - private PropertyChangeListener measureToolListener = new MeasureToolListener(); + private final TerrainProfileLayer profile = new TerrainProfileLayer(); + private final PropertyChangeListener measureToolListener = new MeasureToolListener(); - public AppFrame() - { + public AppFrame() { super(true, true, false); // no layer or statistics panel // Add terrain profile layer @@ -47,24 +68,17 @@ public AppFrame() // Add + tab tabbedPane.add(new JPanel()); tabbedPane.setTitleAt(0, "+"); - tabbedPane.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - if (tabbedPane.getSelectedIndex() == 0) - { - // Add new measure tool in a tab when '+' selected - MeasureTool measureTool = new MeasureTool(getWwd()); - measureTool.setController(new MeasureToolController()); - tabbedPane.add(new MeasureToolPanel(getWwd(), measureTool)); - tabbedPane.setTitleAt(tabbedPane.getTabCount() - 1, "" + (tabbedPane.getTabCount() - 1)); - tabbedPane.setSelectedIndex(tabbedPane.getTabCount() - 1); - switchMeasureTool(); - } - else - { - switchMeasureTool(); - } + tabbedPane.addChangeListener((ChangeEvent changeEvent) -> { + if (tabbedPane.getSelectedIndex() == 0) { + // Add new measure tool in a tab when '+' selected + MeasureTool measureTool = new MeasureTool(getWwd()); + measureTool.setController(new MeasureToolController()); + tabbedPane.add(new MeasureToolPanel(getWwd(), measureTool)); + tabbedPane.setTitleAt(tabbedPane.getTabCount() - 1, "" + (tabbedPane.getTabCount() - 1)); + tabbedPane.setSelectedIndex(tabbedPane.getTabCount() - 1); + switchMeasureTool(); + } else { + switchMeasureTool(); } }); @@ -80,54 +94,48 @@ public void stateChanged(ChangeEvent changeEvent) this.pack(); } - private class MeasureToolListener implements PropertyChangeListener - { - public void propertyChange(PropertyChangeEvent event) - { + private class MeasureToolListener implements PropertyChangeListener { + + @Override + public void propertyChange(PropertyChangeEvent event) { // Measure shape position list changed - update terrain profile if (event.getPropertyName().equals(MeasureTool.EVENT_POSITION_ADD) || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REMOVE) - || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REPLACE)) - { - updateProfile(((MeasureTool)event.getSource())); + || event.getPropertyName().equals(MeasureTool.EVENT_POSITION_REPLACE)) { + updateProfile(((MeasureTool) event.getSource())); } } } - private void switchMeasureTool() - { + private void switchMeasureTool() { // Disarm last measure tool when changing tab and switching tool - if (lastTabIndex != -1) - { - MeasureTool mt = ((MeasureToolPanel)tabbedPane.getComponentAt(lastTabIndex)).getMeasureTool(); + if (lastTabIndex != -1) { + MeasureTool mt = ((MeasureToolPanel) tabbedPane.getComponentAt(lastTabIndex)).getMeasureTool(); mt.setArmed(false); mt.removePropertyChangeListener(measureToolListener); } // Update terrain profile from current measure tool lastTabIndex = tabbedPane.getSelectedIndex(); - MeasureTool mt = ((MeasureToolPanel)tabbedPane.getComponentAt(lastTabIndex)).getMeasureTool(); + MeasureTool mt = ((MeasureToolPanel) tabbedPane.getComponentAt(lastTabIndex)).getMeasureTool(); mt.addPropertyChangeListener(measureToolListener); updateProfile(mt); } - private void updateProfile(MeasureTool mt) - { + private void updateProfile(MeasureTool mt) { ArrayList positions = mt.getPositions(); - if (positions != null && positions.size() > 1) - { + if (positions != null && positions.size() > 1) { profile.setPathPositions(positions); profile.setEnabled(true); - } - else + } else { profile.setEnabled(false); - + } + getWwd().redraw(); } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Measure Tool", MeasureToolUsage.AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Measure Tool", MeasureToolUsage.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/MultiResPath.java b/src/gov/nasa/worldwindx/examples/MultiResPath.java index a7e92b2b9a..6558056baf 100644 --- a/src/gov/nasa/worldwindx/examples/MultiResPath.java +++ b/src/gov/nasa/worldwindx/examples/MultiResPath.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.examples; import gov.nasa.worldwind.WorldWind; @@ -15,47 +36,41 @@ import java.util.*; /** - * Illustrates use of the {@link MultiResolutionPath} shape, which adapts its complexity as the path's distance frome - * the eye point changes. - *

                + * Illustrates use of the {@link MultiResolutionPath} shape, which adapts its complexity as the path's distance from the + * eye point changes. + *

                * Also illustrates the use of the "show positions" feature of {@link Path}. * * @author tag * @version $Id: MultiResPath.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class MultiResPath extends ApplicationTemplate -{ +public class MultiResPath extends ApplicationTemplate { + // Specify several Paths, each with large numbers of positions. protected static final int NUM_POSITIONS = 108000; protected static final double SPEED = 90 / Earth.WGS84_EQUATORIAL_RADIUS; // meters per second to radians - protected static final Position[] ORIGIN = new Position[] - { - Position.fromDegrees(40.2377, -105.6480, 200), - Position.fromDegrees(41.2625, -105.6503, 200), - Position.fromDegrees(42.2285, -105.6169, 200), - Position.fromDegrees(43.2019, -105.6467, 200), - Position.fromDegrees(44.2414, -105.6911, 200), - }; - - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { + protected static final Position[] ORIGIN = new Position[]{ + Position.fromDegrees(40.2377, -105.6480, 200), + Position.fromDegrees(41.2625, -105.6503, 200), + Position.fromDegrees(42.2285, -105.6169, 200), + Position.fromDegrees(43.2019, -105.6467, 200), + Position.fromDegrees(44.2414, -105.6911, 200),}; + + public static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, true, false); makeMany(); } - protected void makeMany() - { - for (Position pos : ORIGIN) - { + protected void makeMany() { + for (Position pos : ORIGIN) { this.addShape(pos); } } - protected void addShape(Position origin) - { + protected void addShape(Position origin) { int altitudeMode = WorldWind.RELATIVE_TO_GROUND; LatLon location = new LatLon(origin); @@ -64,9 +79,8 @@ protected void addShape(Position origin) double distance = 60 * SPEED / 20; // seconds x radians per second // Create the Path positions. - List positions = new ArrayList(NUM_POSITIONS); - for (int i = 0; i < NUM_POSITIONS; i++) - { + List positions = new ArrayList<>(NUM_POSITIONS); + for (int i = 0; i < NUM_POSITIONS; i++) { Position position = new Position(location, altitude); positions.add(position); @@ -80,7 +94,7 @@ protected void addShape(Position origin) attrs.setDrawInterior(false); attrs.setOutlineMaterial(Material.RED); - MultiResolutionPath path = new MultiResolutionPath(positions); + Path path = new Path(positions); // Indicate that dots are to be drawn at each specified path position. path.setShowPositions(true); @@ -100,8 +114,7 @@ protected void addShape(Position origin) } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind UAVPath Test", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind UAVPath Test", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/NetworkOfflineMode.java b/src/gov/nasa/worldwindx/examples/NetworkOfflineMode.java index fc2fd7f5ce..35f0276092 100644 --- a/src/gov/nasa/worldwindx/examples/NetworkOfflineMode.java +++ b/src/gov/nasa/worldwindx/examples/NetworkOfflineMode.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -14,7 +36,7 @@ import java.awt.event.*; /** - * Shows how to detach World Wind from the network and reattach it. + * Shows how to detach WorldWind from the network and reattach it. * * @author tag * @version $Id: NetworkOfflineMode.java 2109 2014-06-30 16:52:38Z tgaskins $ diff --git a/src/gov/nasa/worldwindx/examples/OnScreenLayerManager.java b/src/gov/nasa/worldwindx/examples/OnScreenLayerManager.java index 4f688a1eab..28053611d8 100644 --- a/src/gov/nasa/worldwindx/examples/OnScreenLayerManager.java +++ b/src/gov/nasa/worldwindx/examples/OnScreenLayerManager.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -31,6 +53,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind On-Screen Layer Manager", AppFrame.class); + ApplicationTemplate.start("WorldWind On-Screen Layer Manager", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java b/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java index 9234c63833..3d518d4834 100644 --- a/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java +++ b/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java @@ -1,16 +1,38 @@ /* - * Copyright (C) 2013 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLCanvas; /** - * Determines whether a device supports the OpenGL features necessary for World Wind. + * Determines whether a device supports the OpenGL features necessary for WorldWind. * * @author tag * @version $Id: OpenGLSupportTest.java 1675 2013-10-18 00:32:15Z tgaskins $ diff --git a/src/gov/nasa/worldwindx/examples/ParallelPaths.java b/src/gov/nasa/worldwindx/examples/ParallelPaths.java index e523da99fc..6abcdf2d66 100644 --- a/src/gov/nasa/worldwindx/examples/ParallelPaths.java +++ b/src/gov/nasa/worldwindx/examples/ParallelPaths.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -104,6 +126,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LONGITUDE, -122.78); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 8000); - ApplicationTemplate.start("World Wind Multi Path", AppFrame.class); + ApplicationTemplate.start("WorldWind Multi Path", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PathPositionColors.java b/src/gov/nasa/worldwindx/examples/PathPositionColors.java index 18836fcffa..136670e0e9 100644 --- a/src/gov/nasa/worldwindx/examples/PathPositionColors.java +++ b/src/gov/nasa/worldwindx/examples/PathPositionColors.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -21,7 +43,7 @@ /** * Illustrates usage of the per-position color feature of {@link Path}. Path's per-position colors may be assigned in * any manner the application chooses. This example illustrates only one way of assigning color to each path position. - *

                + *

                * Also illustrates the use of the "show positions" feature of {@link Path}. * * @author dcollins @@ -54,8 +76,7 @@ public AppFrame() // Create a path with the specified positions that follows the terrain and draws a point at each position. Path path = new Path(pathPositions); - path.setAltitudeMode(WorldWind.CLAMP_TO_GROUND); - path.setFollowTerrain(true); + path.setSurfacePath(true); path.setShowPositions(true); path.setShowPositionsScale(3); @@ -137,6 +158,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LONGITUDE, -122.3137); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 3000); - ApplicationTemplate.start("World Wind Path Position Colors", AppFrame.class); + ApplicationTemplate.start("WorldWind Path Position Colors", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Paths.java b/src/gov/nasa/worldwindx/examples/Paths.java index dc3029223a..990031d490 100644 --- a/src/gov/nasa/worldwindx/examples/Paths.java +++ b/src/gov/nasa/worldwindx/examples/Paths.java @@ -1,9 +1,30 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ - package gov.nasa.worldwindx.examples; import gov.nasa.worldwind.WorldWind; @@ -13,6 +34,7 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.render.markers.*; import gov.nasa.worldwind.util.*; +import java.awt.Color; import java.util.*; @@ -23,12 +45,11 @@ * @author tag * @version $Id: Paths.java 2292 2014-09-02 21:13:05Z tgaskins $ */ -public class Paths extends ApplicationTemplate -{ - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { +public class Paths extends ApplicationTemplate { + + public static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, true, false); // Add a dragger to enable shape dragging @@ -38,11 +59,11 @@ public AppFrame() // Create and set an attribute bundle. ShapeAttributes attrs = new BasicShapeAttributes(); - attrs.setOutlineMaterial(new Material(WWUtil.makeRandomColor(null))); + attrs.setOutlineMaterial(new Material(Color.YELLOW)); attrs.setOutlineWidth(2d); // Create a path, set some of its properties and set its attributes. - ArrayList pathPositions = new ArrayList(); + ArrayList pathPositions = new ArrayList<>(); pathPositions.add(Position.fromDegrees(28, -102, 1e4)); pathPositions.add(Position.fromDegrees(35, -100, 1e4)); Path path = new Path(pathPositions); @@ -52,15 +73,22 @@ public AppFrame() path.setPathType(AVKey.GREAT_CIRCLE); layer.addRenderable(path); + // Create a path that follows the terrain + path = new Path(pathPositions); + path.setAttributes(attrs); + path.setVisible(true); + path.setSurfacePath(true); + layer.addRenderable(path); + // Create a path that uses all default values. - pathPositions = new ArrayList(); + pathPositions = new ArrayList<>(); pathPositions.add(Position.fromDegrees(28, -104, 1e4)); pathPositions.add(Position.fromDegrees(35, -102, 1e4)); path = new Path(pathPositions); layer.addRenderable(path); // Create a path with more than two positions and closed. - pathPositions = new ArrayList(); + pathPositions = new ArrayList<>(); pathPositions.add(Position.fromDegrees(28, -106, 4e4)); pathPositions.add(Position.fromDegrees(35, -104, 4e4)); pathPositions.add(Position.fromDegrees(35, -107, 4e4)); @@ -71,8 +99,8 @@ public AppFrame() path.setPathType(AVKey.LINEAR); attrs = new BasicShapeAttributes(); - attrs.setOutlineMaterial(new Material(WWUtil.makeRandomColor(null))); - attrs.setInteriorMaterial(new Material(WWUtil.makeRandomColor(null))); + attrs.setOutlineMaterial(new Material(Color.BLUE)); + attrs.setInteriorMaterial(new Material(Color.RED)); attrs.setOutlineWidth(2); path.setAttributes(attrs); @@ -81,7 +109,7 @@ public AppFrame() // Add the layer to the model. insertBeforeCompass(getWwd(), layer); - List markers = new ArrayList(1); + List markers = new ArrayList<>(1); markers.add(new BasicMarker(Position.fromDegrees(90, 0), new BasicMarkerAttributes())); MarkerLayer markerLayer = new MarkerLayer(); markerLayer.setMarkers(markers); @@ -89,8 +117,7 @@ public AppFrame() } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Paths", AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Paths", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PathsOnDateline.java b/src/gov/nasa/worldwindx/examples/PathsOnDateline.java index e526d33367..600d921094 100644 --- a/src/gov/nasa/worldwindx/examples/PathsOnDateline.java +++ b/src/gov/nasa/worldwindx/examples/PathsOnDateline.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/PathsWithDirection.java b/src/gov/nasa/worldwindx/examples/PathsWithDirection.java index 36b02e1703..614d27b1ee 100644 --- a/src/gov/nasa/worldwindx/examples/PathsWithDirection.java +++ b/src/gov/nasa/worldwindx/examples/PathsWithDirection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -70,6 +92,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LONGITUDE, -122.77); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 22000); - ApplicationTemplate.start("World Wind Paths With Direction", AppFrame.class); + ApplicationTemplate.start("WorldWind Paths With Direction", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PathsWithLabels.java b/src/gov/nasa/worldwindx/examples/PathsWithLabels.java index a3ac1cb1b1..6a26aecb9e 100644 --- a/src/gov/nasa/worldwindx/examples/PathsWithLabels.java +++ b/src/gov/nasa/worldwindx/examples/PathsWithLabels.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -111,7 +133,7 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_LONGITUDE, -122.95); Configuration.setValue(AVKey.INITIAL_ALTITUDE, 70000); - start("World Wind Paths with Labels", AppFrame.class); + start("WorldWind Paths with Labels", AppFrame.class); } // Boundary data for San Juan and Snohomish Counties take from diff --git a/src/gov/nasa/worldwindx/examples/PersistSessionState.java b/src/gov/nasa/worldwindx/examples/PersistSessionState.java index c2fe6340d4..966d54c522 100644 --- a/src/gov/nasa/worldwindx/examples/PersistSessionState.java +++ b/src/gov/nasa/worldwindx/examples/PersistSessionState.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -22,7 +44,7 @@ public class PersistSessionState extends ApplicationTemplate public static class AppFrame extends ApplicationTemplate.AppFrame { /** - * Create a SessionState utility to load and save World Wind's layer and view state to the default location. + * Create a SessionState utility to load and save WorldWind's layer and view state to the default location. * Initialized to a new SessionState with its session key set to this application's class name. */ protected SessionState sessionState = new SessionState(PersistSessionState.class.getName()); @@ -103,6 +125,6 @@ public static void main(String[] args) System.setProperty("apple.eawt.quitStrategy", "CLOSE_ALL_WINDOWS"); } - start("World Wind Persist Session State", AppFrame.class); + start("WorldWind Persist Session State", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PickFrustum.java b/src/gov/nasa/worldwindx/examples/PickFrustum.java index b876929887..e7edac2d6f 100644 --- a/src/gov/nasa/worldwindx/examples/PickFrustum.java +++ b/src/gov/nasa/worldwindx/examples/PickFrustum.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -10,7 +32,7 @@ import gov.nasa.worldwind.layers.*; import gov.nasa.worldwind.render.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.*; import javax.swing.border.*; import javax.swing.event.*; @@ -341,6 +363,6 @@ public void stateChanged(final ChangeEvent e) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Picking Frustum", AppFrame.class); + ApplicationTemplate.start("WorldWind Picking Frustum", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PlaceNames.java b/src/gov/nasa/worldwindx/examples/PlaceNames.java index 54f028d7af..8ced362994 100644 --- a/src/gov/nasa/worldwindx/examples/PlaceNames.java +++ b/src/gov/nasa/worldwindx/examples/PlaceNames.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -35,6 +57,6 @@ private JPanel makeControlPanel() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Place Names", AppFrame.class); + ApplicationTemplate.start("WorldWind Place Names", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PlaceNamesPanel.java b/src/gov/nasa/worldwindx/examples/PlaceNamesPanel.java index 54d41513ca..861b0f507d 100644 --- a/src/gov/nasa/worldwindx/examples/PlaceNamesPanel.java +++ b/src/gov/nasa/worldwindx/examples/PlaceNamesPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/PlacemarkDecluttering.java b/src/gov/nasa/worldwindx/examples/PlacemarkDecluttering.java index d1c27a12ba..8fcc7dac3e 100644 --- a/src/gov/nasa/worldwindx/examples/PlacemarkDecluttering.java +++ b/src/gov/nasa/worldwindx/examples/PlacemarkDecluttering.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -21,7 +43,7 @@ * Illustrates how to use the {@link gov.nasa.worldwind.util.PlacemarkClutterFilter} to declutter PointPlacemark labels. * To enable this decluttering a filter has to be specified to the scene controller and each PointPlacemark that * participates in decluttering must be enabled for decluttering. - *

                + *

                * This example also enables label picking for all PointPlacemarks to illustrate that labels can be picked both when * they're not decluttered and when they are. * @@ -242,6 +264,6 @@ protected void setHighlightAttributes(PointPlacemark pp) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Placemark Decluttering", AppFrame.class); + ApplicationTemplate.start("WorldWind Placemark Decluttering", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/PlacemarkLabelEditing.java b/src/gov/nasa/worldwindx/examples/PlacemarkLabelEditing.java index 03d1540ec5..c4bbcfebbb 100644 --- a/src/gov/nasa/worldwindx/examples/PlacemarkLabelEditing.java +++ b/src/gov/nasa/worldwindx/examples/PlacemarkLabelEditing.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -85,6 +107,6 @@ public void selected(SelectEvent event) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Placemark Label Editing", AppFrame.class); + ApplicationTemplate.start("WorldWind Placemark Label Editing", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Placemarks.java b/src/gov/nasa/worldwindx/examples/Placemarks.java index 38deb88054..4564da9dfa 100644 --- a/src/gov/nasa/worldwindx/examples/Placemarks.java +++ b/src/gov/nasa/worldwindx/examples/Placemarks.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -232,7 +254,7 @@ public static void createTacticalSymbolPointPlacemark(final RenderableLayer laye params.setValue(AVKey.COLOR, Color.WHITE); final BufferedImage highlightImage = iconRetriever.createIcon("SFAPMFQM--GIUSA", params); - // Add the placemark to World Wind on the event dispatch thread. + // Add the placemark to WorldWind on the event dispatch thread. SwingUtilities.invokeLater(new Runnable() { @Override @@ -274,6 +296,6 @@ public void run() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Placemarks", AppFrame.class); + ApplicationTemplate.start("WorldWind Placemarks", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Polygons.java b/src/gov/nasa/worldwindx/examples/Polygons.java index 60abd1c3eb..cd2b6e4ad6 100644 --- a/src/gov/nasa/worldwindx/examples/Polygons.java +++ b/src/gov/nasa/worldwindx/examples/Polygons.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -138,6 +160,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Polygons", AppFrame.class); + ApplicationTemplate.start("WorldWind Polygons", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Pyramids.java b/src/gov/nasa/worldwindx/examples/Pyramids.java index 04589bedca..f03941e59e 100644 --- a/src/gov/nasa/worldwindx/examples/Pyramids.java +++ b/src/gov/nasa/worldwindx/examples/Pyramids.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -135,6 +157,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Pyramids", AppFrame.class); + ApplicationTemplate.start("WorldWind Pyramids", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/RadarVolume.java b/src/gov/nasa/worldwindx/examples/RadarVolume.java index 5df2a48545..2714b94f70 100644 --- a/src/gov/nasa/worldwindx/examples/RadarVolume.java +++ b/src/gov/nasa/worldwindx/examples/RadarVolume.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -13,7 +35,7 @@ import gov.nasa.worldwind.terrain.Terrain; import gov.nasa.worldwind.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.xml.stream.*; import java.io.IOException; import java.nio.*; diff --git a/src/gov/nasa/worldwindx/examples/RadarVolumeExample.java b/src/gov/nasa/worldwindx/examples/RadarVolumeExample.java index a510f67c5a..c859c45e44 100644 --- a/src/gov/nasa/worldwindx/examples/RadarVolumeExample.java +++ b/src/gov/nasa/worldwindx/examples/RadarVolumeExample.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/RemoteSurfaceImage.java b/src/gov/nasa/worldwindx/examples/RemoteSurfaceImage.java index a73d589b65..42e3af88e4 100644 --- a/src/gov/nasa/worldwindx/examples/RemoteSurfaceImage.java +++ b/src/gov/nasa/worldwindx/examples/RemoteSurfaceImage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -12,7 +34,7 @@ /** * This example demonstrates how to retrieve a remote image and display it as a {@link * gov.nasa.worldwind.render.SurfaceImage}. SurfaceImage downloads the image in a separate thread via the - * World Wind retrieval service. Once the image is retrieved, SurfaceImage renders it on the globe. + * WorldWind retrieval service. Once the image is retrieved, SurfaceImage renders it on the globe. * * @author dcollins * @version $Id: RemoteSurfaceImage.java 2109 2014-06-30 16:52:38Z tgaskins $ @@ -40,6 +62,6 @@ public AppFrame() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Remote Surface Image", RemoteSurfaceImage.AppFrame.class); + ApplicationTemplate.start("WorldWind Remote Surface Image", RemoteSurfaceImage.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/RigidShapes.java b/src/gov/nasa/worldwindx/examples/RigidShapes.java index a544795b8d..cbcf3c9f42 100644 --- a/src/gov/nasa/worldwindx/examples/RigidShapes.java +++ b/src/gov/nasa/worldwindx/examples/RigidShapes.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -158,6 +180,6 @@ protected void makeShapes() public static void main(String[] args) { - ApplicationTemplate.start("World Wind Rigid Shapes", AppFrame.class); + ApplicationTemplate.start("WorldWind Rigid Shapes", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/RotatedSector.java b/src/gov/nasa/worldwindx/examples/RotatedSector.java index e7365c00e9..1f93cfeccd 100644 --- a/src/gov/nasa/worldwindx/examples/RotatedSector.java +++ b/src/gov/nasa/worldwindx/examples/RotatedSector.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/RubberSheetImage.java b/src/gov/nasa/worldwindx/examples/RubberSheetImage.java index db9378a236..a2ef039eba 100644 --- a/src/gov/nasa/worldwindx/examples/RubberSheetImage.java +++ b/src/gov/nasa/worldwindx/examples/RubberSheetImage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -522,6 +544,6 @@ protected static BufferedImage createPowerOfTwoScaledCopy(BufferedImage image) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Rubber Sheet Image", RubberSheetImage.AppFrame.class); + ApplicationTemplate.start("WorldWind Rubber Sheet Image", RubberSheetImage.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ScankortDenmark.java b/src/gov/nasa/worldwindx/examples/ScankortDenmark.java deleted file mode 100644 index 7d846bbacb..0000000000 --- a/src/gov/nasa/worldwindx/examples/ScankortDenmark.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. - */ -package gov.nasa.worldwindx.examples; - -import gov.nasa.worldwind.*; -import gov.nasa.worldwind.avlist.AVKey; -import gov.nasa.worldwind.geom.*; -import gov.nasa.worldwind.globes.*; -import gov.nasa.worldwind.layers.*; -import gov.nasa.worldwind.terrain.*; - -/** - * This example demonstrates high resolution imagery (0.2 meters per pixel) and elevation data (1.6 meters per pixel) - * served by the World Wind WMS, and visualized by the World Wind Java client. - *

                - * The data is from Denmark. Details for loading the imagery can be found in: config/Earth/ScankortDenmarkImageLayer.xml - * while information for loading the elevation data is in: config/Earth/ScankortDenmarkDSMElevationModel.xml. - * - * @author dcollins - * @version $Id: ScankortDenmark.java 2109 2014-06-30 16:52:38Z tgaskins $ - */ -public class ScankortDenmark -{ - public static void setupConfiguration() - { - Sector sector = getDenmarkSector(); - Configuration.setValue(AVKey.INITIAL_ALTITUDE, computeZoomForExtent(sector)); - Configuration.setValue(AVKey.INITIAL_LATITUDE, sector.getCentroid().getLatitude().degrees); - Configuration.setValue(AVKey.INITIAL_LONGITUDE, sector.getCentroid().getLongitude().degrees); - } - - public static Sector getDenmarkSector() - { - return new Sector( - Angle.fromDMS("54\u00B0 33\u2019 35\u201d"), Angle.fromDMS("57\u00B0 45\u2019 7\u201d"), - Angle.fromDMS("8\u00B0 4\u2019 22\u201d"), Angle.fromDMS("15\u00B0 11\u2019 55\u201d")); - } - - public static double computeZoomForExtent(Sector sector) - { - Angle delta = sector.getDeltaLat(); - if (sector.getDeltaLon().compareTo(delta) > 0) - delta = sector.getDeltaLon(); - double arcLength = delta.radians * Earth.WGS84_EQUATORIAL_RADIUS; - double fieldOfView = Configuration.getDoubleValue(AVKey.FOV, 45.0); - return arcLength / (2 * Math.tan(fieldOfView / 2.0)); - } - - private static class MyAppFrame extends ApplicationTemplate.AppFrame - { - public MyAppFrame() - { - super(); - - // Add the high resolution imagery. - Factory layerFactory = new BasicLayerFactory(); - Layer layer = (Layer) layerFactory.createFromConfigSource("config/Earth/ScankortDenmarkImageLayer.xml", - null); - layer.setEnabled(true); - ApplicationTemplate.insertBeforePlacenames(this.getWwd(), layer); - - // Add the high resolution elevations. - Factory emf = new BasicElevationModelFactory(); - ElevationModel em = (ElevationModel) - emf.createFromConfigSource("config/Earth/ScankortDenmarkDSMElevationModel.xml", null); - if (this.getWwd().getModel().getGlobe().getElevationModel() instanceof CompoundElevationModel) - ((CompoundElevationModel) - this.getWwd().getModel().getGlobe().getElevationModel()).addElevationModel(em); - else - this.getWwd().getModel().getGlobe().setElevationModel(em); // replace current EM - } - } - - public static void main(String[] args) - { - setupConfiguration(); - ApplicationTemplate.start("Scankort Denmark Data", MyAppFrame.class); - } -} diff --git a/src/gov/nasa/worldwindx/examples/ScreenImageDragging.java b/src/gov/nasa/worldwindx/examples/ScreenImageDragging.java index d7008c0854..8254b2041c 100644 --- a/src/gov/nasa/worldwindx/examples/ScreenImageDragging.java +++ b/src/gov/nasa/worldwindx/examples/ScreenImageDragging.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/ScreenSelection.java b/src/gov/nasa/worldwindx/examples/ScreenSelection.java index 32f82ff791..b83f07ef97 100644 --- a/src/gov/nasa/worldwindx/examples/ScreenSelection.java +++ b/src/gov/nasa/worldwindx/examples/ScreenSelection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -198,7 +220,7 @@ protected void highlightSelectedObjects(List list) } } - // We've potentially changed the highlight state of one or more objects. Request that the world window + // We've potentially changed the highlight state of one or more objects. Request that the WorldWindow // redraw itself in order to refresh these object's display. This is necessary because changes in the // objects in the pick rectangle do not necessarily correspond to mouse movements. For example, the pick // rectangle may be cleared when the user releases the mouse button at the end of a drag. In this case, @@ -209,6 +231,6 @@ protected void highlightSelectedObjects(List list) public static void main(String[] args) { - start("World Wind Screen Selection", AppFrame.class); + start("WorldWind Screen Selection", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ScreenShots.java b/src/gov/nasa/worldwindx/examples/ScreenShots.java index 69d5b41884..badf81ff37 100644 --- a/src/gov/nasa/worldwindx/examples/ScreenShots.java +++ b/src/gov/nasa/worldwindx/examples/ScreenShots.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/SectorSelection.java b/src/gov/nasa/worldwindx/examples/SectorSelection.java index 5150b0b1b7..1c9e30cfe8 100644 --- a/src/gov/nasa/worldwindx/examples/SectorSelection.java +++ b/src/gov/nasa/worldwindx/examples/SectorSelection.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/ShapeClipping.java b/src/gov/nasa/worldwindx/examples/ShapeClipping.java index e0eb16db6f..843235403c 100644 --- a/src/gov/nasa/worldwindx/examples/ShapeClipping.java +++ b/src/gov/nasa/worldwindx/examples/ShapeClipping.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -22,9 +44,9 @@ /** * Shows how to use the {@link gov.nasa.worldwind.util.combine.Combinable} interface and the {@link - * gov.nasa.worldwind.util.combine.ShapeCombiner} class to compute the intersection of a World Wind surface shapes with + * gov.nasa.worldwind.util.combine.ShapeCombiner} class to compute the intersection of a WorldWind surface shapes with * Earth's land and water. - *

                + *

                * This example provides an editable surface circle indicating a region to clip against either land or water. The land * and water are represented by an ESRI shapefile containing polygons of Earth's continents, including major islands. * Clipping against land is accomplished by computing the intersection of the surface circle and the shapefile polygons. @@ -172,6 +194,6 @@ protected void keepShapeHighlighted(boolean tf) public static void main(String[] args) { - start("World Wind Shape Clipping", AppFrame.class); + start("WorldWind Shape Clipping", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ShapeClippingPanel.java b/src/gov/nasa/worldwindx/examples/ShapeClippingPanel.java index d70392612f..96c04d1e57 100644 --- a/src/gov/nasa/worldwindx/examples/ShapeClippingPanel.java +++ b/src/gov/nasa/worldwindx/examples/ShapeClippingPanel.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/ShapeCombining.java b/src/gov/nasa/worldwindx/examples/ShapeCombining.java index f6f11fb082..66a3b33d40 100644 --- a/src/gov/nasa/worldwindx/examples/ShapeCombining.java +++ b/src/gov/nasa/worldwindx/examples/ShapeCombining.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -15,9 +37,9 @@ /** * Shows how to use the {@link gov.nasa.worldwind.util.combine.Combinable} interface and the {@link - * gov.nasa.worldwind.util.combine.ShapeCombiner} class to combine World Wind surface shapes into a complex set of + * gov.nasa.worldwind.util.combine.ShapeCombiner} class to combine WorldWind surface shapes into a complex set of * contours by using boolean operations. - *

                + *

                * This example creates two static SurfaceCircle instances that partially overlap and displays them in a layer named * "Original". A ShapeCombiner is used to combine the two surface circles into a potentially complex set of contours * using boolean operations. Three examples of such operations are given: union, intersection and difference. The result @@ -89,6 +111,6 @@ protected void displayContours(ContourList contours, String displayName, Positio public static void main(String[] args) { - start("World Wind Shape Combining", AppFrame.class); + start("WorldWind Shape Combining", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ShapeEditing.java b/src/gov/nasa/worldwindx/examples/ShapeEditing.java index e8276363e3..d660e298b3 100644 --- a/src/gov/nasa/worldwindx/examples/ShapeEditing.java +++ b/src/gov/nasa/worldwindx/examples/ShapeEditing.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -214,8 +236,7 @@ public AppFrame() positions.add(Position.fromDegrees(-90, 180)); positions.add(Position.fromDegrees(90, 180)); Path antiMeridian = new Path(positions); - antiMeridian.setFollowTerrain(true); - antiMeridian.setAltitudeMode(WorldWind.CLAMP_TO_GROUND); + antiMeridian.setSurfacePath(true); ShapeAttributes antiMeridianAttributes = new BasicShapeAttributes(); shapeAttributes.setOutlineMaterial(Material.WHITE); antiMeridian.setAttributes(antiMeridianAttributes); @@ -290,6 +311,6 @@ protected void keepShapeHighlighted(boolean tf) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Shape Editing", ShapeEditing.AppFrame.class); + ApplicationTemplate.start("WorldWind Shape Editing", ShapeEditing.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ShapeEditingExtension.java b/src/gov/nasa/worldwindx/examples/ShapeEditingExtension.java index 4640dfbd57..667a10579a 100644 --- a/src/gov/nasa/worldwindx/examples/ShapeEditingExtension.java +++ b/src/gov/nasa/worldwindx/examples/ShapeEditingExtension.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -375,7 +397,7 @@ public AppFrame() // Receive selection event to determine when to place the shape in editing mode. this.getWwd().addSelectListener(this); - // Create the custom shape, add it to a layer and add the layer to the World Window's layer list. + // Create the custom shape, add it to a layer and add the layer to the WorldWindow's layer list. RenderableLayer layer = new RenderableLayer(); ShapeAttributes attrs = new BasicShapeAttributes(); @@ -465,6 +487,6 @@ protected void keepShapeHighlighted(boolean tf) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Shape Editing Extension", ShapeEditingExtension.AppFrame.class); + ApplicationTemplate.start("WorldWind Shape Editing Extension", ShapeEditingExtension.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ShapefileAttributeGroups.java b/src/gov/nasa/worldwindx/examples/ShapefileAttributeGroups.java index 124c167805..7e8cdd5540 100644 --- a/src/gov/nasa/worldwindx/examples/ShapefileAttributeGroups.java +++ b/src/gov/nasa/worldwindx/examples/ShapefileAttributeGroups.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -166,6 +188,6 @@ public static void main(String[] args) { Configuration.setValue(AVKey.INITIAL_LATITUDE, 30); Configuration.setValue(AVKey.INITIAL_LONGITUDE, 30); - start("World Wind Shapefile Attribute Groups", AppFrame.class); + start("WorldWind Shapefile Attribute Groups", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/ShapefileViewer.java b/src/gov/nasa/worldwindx/examples/ShapefileViewer.java index f2d264b122..4ff887898f 100644 --- a/src/gov/nasa/worldwindx/examples/ShapefileViewer.java +++ b/src/gov/nasa/worldwindx/examples/ShapefileViewer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -20,8 +42,8 @@ import java.io.File; /** - * Illustrates how to import ESRI Shapefiles into World Wind. This uses a {@link ShapefileLayerFactory} to - * parse a Shapefile's contents and convert the shapefile into an equivalent World Wind shape. This provides examples of + * Illustrates how to import ESRI Shapefiles into WorldWind. This uses a {@link ShapefileLayerFactory} to + * parse a Shapefile's contents and convert the shapefile into an equivalent WorldWind shape. This provides examples of * importing a Shapefile on the local hard drive and importing a Shapefile at a remote URL. * * @author Patrick Murris @@ -148,6 +170,6 @@ public void actionPerformed(ActionEvent actionEvent) public static void main(String[] args) { - start("World Wind Shapefile Viewer", AppFrame.class); + start("WorldWind Shapefile Viewer", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Shapefiles.java b/src/gov/nasa/worldwindx/examples/Shapefiles.java index 7e1eb646ff..cb0dd3c451 100644 --- a/src/gov/nasa/worldwindx/examples/Shapefiles.java +++ b/src/gov/nasa/worldwindx/examples/Shapefiles.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -13,8 +35,8 @@ import javax.swing.*; /** - * Illustrates how to import ESRI Shapefiles into World Wind. This uses a {@link ShapefileLayerFactory} to - * parse a Shapefile's contents and convert the shapefile into an equivalent World Wind shape. + * Illustrates how to import ESRI Shapefiles into WorldWind. This uses a {@link ShapefileLayerFactory} to + * parse a Shapefile's contents and convert the shapefile into an equivalent WorldWind shape. * * @version $Id: Shapefiles.java 3212 2015-06-18 02:45:56Z tgaskins $ */ @@ -48,7 +70,7 @@ public void completion(Object result) final Layer layer = (Layer) result; // the result is the layer the factory created layer.setName(WWIO.getFilename(layer.getName())); - // Add the layer to the World Window's layer list on the Event Dispatch Thread. + // Add the layer to the WorldWindow's layer list on the Event Dispatch Thread. SwingUtilities.invokeLater(new Runnable() { @Override @@ -70,6 +92,6 @@ public void exception(Exception e) public static void main(String[] args) { - start("World Wind Shapefiles", AppFrame.class); + start("WorldWind Shapefiles", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/Shapes.java b/src/gov/nasa/worldwindx/examples/Shapes.java index 8c62c6b041..d210524fc8 100644 --- a/src/gov/nasa/worldwindx/examples/Shapes.java +++ b/src/gov/nasa/worldwindx/examples/Shapes.java @@ -1,11 +1,33 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; -import com.jogamp.opengl.util.awt.TextRenderer; +import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.Configuration; import gov.nasa.worldwind.event.*; import gov.nasa.worldwind.geom.*; @@ -14,6 +36,9 @@ import gov.nasa.worldwind.render.*; import gov.nasa.worldwind.util.BasicDragger; +import com.jogamp.opengl.util.awt.TextRenderer; +import gov.nasa.worldwind.WorldWind; + import javax.swing.*; import javax.swing.border.*; import javax.swing.event.*; @@ -28,39 +53,37 @@ * @author tag * @version $Id: Shapes.java 1171 2013-02-11 21:45:02Z dcollins $ */ -public class Shapes -{ - private static class Info - { +public class Shapes { + + private static class Info { + private final Object object; private final String name; - - public Info(String name, Object object) - { + + public Info(String name, Object object) { this.object = object; this.name = name; } } - + @SuppressWarnings("unchecked") - protected static class AppFrame extends JFrame - { + protected static class AppFrame extends JFrame { + private Dimension canvasSize = new Dimension(800, 600); private ApplicationTemplate.AppPanel wwjPanel; private RenderableLayer layer = new RenderableLayer(); private TextRenderer textRenderer = new TextRenderer(java.awt.Font.decode("Arial-Plain-13"), true, false); - - public AppFrame() - { + + public AppFrame() { // Create the WorldWindow. this.wwjPanel = new ApplicationTemplate.AppPanel(this.canvasSize, true); this.wwjPanel.setPreferredSize(canvasSize); - + ApplicationTemplate.insertBeforePlacenames(this.wwjPanel.getWwd(), layer); - + JPanel shapesPanel = makeShapeSelectionPanel(); shapesPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - + JPanel attrsPanel = makeAttributesPanel(); attrsPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); @@ -70,7 +93,7 @@ public AppFrame() JPanel p = new JPanel(new BorderLayout(6, 6)); p.add(attrsPanel, BorderLayout.CENTER); controlPanel.add(p, BorderLayout.SOUTH); - + this.getContentPane().add(wwjPanel, BorderLayout.CENTER); this.getContentPane().add(controlPanel, BorderLayout.WEST); this.pack(); @@ -84,31 +107,26 @@ public AppFrame() int y = parentLocation.y + (parentSize.height - prefSize.height) / 2; this.setLocation(x, y); this.setResizable(true); - - wwjPanel.getWwd().addRenderingListener(new RenderingListener() - { - public void stageChanged(RenderingEvent event) - { - if (!event.getStage().equals(RenderingEvent.BEFORE_BUFFER_SWAP)) - return; - - if (currentShape instanceof Polyline) - { - Polyline p = (Polyline) currentShape; - String length = Double.toString(p.getLength()); - textRenderer.beginRendering(wwjPanel.getWidth(), wwjPanel.getHeight()); - textRenderer.draw(length, 100, 100); - textRenderer.endRendering(); - } + + wwjPanel.getWwd().addRenderingListener((RenderingEvent event) -> { + if (!event.getStage().equals(RenderingEvent.BEFORE_BUFFER_SWAP)) { + return; + } + if (currentShape instanceof Path) { + Path p1 = (Path) currentShape; + String length = Double.toString(p1.getLength()); + textRenderer.beginRendering(wwjPanel.getWidth(), wwjPanel.getHeight()); + textRenderer.draw(length, 100, 100); + textRenderer.endRendering(); } }); // Enable dragging and other selection responses this.setupSelection(); } - + private Renderable currentShape; - + private String currentPathColor = "Yellow"; private int currentPathOpacity = 10; private double currentPathWidth = 1; @@ -118,582 +136,496 @@ public void stageChanged(RenderingEvent event) private float currentOffset = 0; private int currentTerrainConformance = 10; private int currentNumSubsegments = 10; - + private String currentBorderColor = "Yellow"; private double currentBorderWidth = 1; private int currentBorderOpacity = 10; private String currentBorderStyle = "Solid"; - + private String currentInteriorColor = "Yellow"; private int currentInteriorOpacity = 10; private String currentInteriorStyle = "Solid"; - - private ArrayList onTerrainOnlyItems = new ArrayList(); - private ArrayList offTerrainOnlyItems = new ArrayList(); - - private void update() - { - for (JComponent c : onTerrainOnlyItems) - { + + private ArrayList onTerrainOnlyItems = new ArrayList<>(); + private ArrayList offTerrainOnlyItems = new ArrayList<>(); + + private void update() { + onTerrainOnlyItems.forEach((c) -> { c.setEnabled(currentFollowTerrain); - } - - for (JComponent c : offTerrainOnlyItems) - { + }); + + offTerrainOnlyItems.forEach((c) -> { c.setEnabled(!currentFollowTerrain); - } - - if (this.currentShape instanceof SurfaceShape) - { + }); + + if (this.currentShape instanceof SurfaceShape) { SurfaceShape shape = (SurfaceShape) currentShape; ShapeAttributes attr = shape.getAttributes(); - - if (attr == null) + + if (attr == null) { attr = new BasicShapeAttributes(); - - if (!currentBorderStyle.equals("None")) - { + } + + if (!currentBorderStyle.equals("None")) { float alpha = currentBorderOpacity >= 10 ? 1f : currentBorderOpacity <= 0 ? 0f - : currentBorderOpacity / 10f; + : currentBorderOpacity / 10f; Color color = null; - if (currentBorderColor.equals("Yellow")) - color = new Color(1f, 1f, 0f); - else if (currentBorderColor.equals("Red")) - color = new Color(1f, 0f, 0f); - else if (currentBorderColor.equals("Green")) - color = new Color(0f, 1f, 0f); - else if (currentBorderColor.equals("Blue")) - color = new Color(0f, 0f, 1f); - + switch (currentBorderColor) { + case "Yellow": + color = new Color(1f, 1f, 0f); + break; + case "Red": + color = new Color(1f, 0f, 0f); + break; + case "Green": + color = new Color(0f, 1f, 0f); + break; + case "Blue": + color = new Color(0f, 0f, 1f); + break; + default: + break; + } + attr.setDrawOutline(true); attr.setOutlineMaterial(new Material(color)); attr.setOutlineOpacity(alpha); attr.setOutlineWidth(currentBorderWidth); - } - else - { + } else { attr.setDrawOutline(false); } - - if (!currentInteriorStyle.equals("None")) - { + + if (!currentInteriorStyle.equals("None")) { float alpha = currentInteriorOpacity >= 10 ? 1f : currentInteriorOpacity <= 0 ? 0f - : currentInteriorOpacity / 10f; + : currentInteriorOpacity / 10f; Color color = null; - if (currentInteriorColor.equals("Yellow")) - color = new Color(1f, 1f, 0f); - else if (currentInteriorColor.equals("Red")) - color = new Color(1f, 0f, 0f); - else if (currentInteriorColor.equals("Green")) - color = new Color(0f, 1f, 0f); - else if (currentInteriorColor.equals("Blue")) - color = new Color(0f, 0f, 1f); - + switch (currentInteriorColor) { + case "Yellow": + color = new Color(1f, 1f, 0f); + break; + case "Red": + color = new Color(1f, 0f, 0f); + break; + case "Green": + color = new Color(0f, 1f, 0f); + break; + case "Blue": + color = new Color(0f, 0f, 1f); + break; + default: + break; + } + attr.setInteriorMaterial(new Material(color)); attr.setInteriorOpacity(alpha); attr.setDrawInterior(true); - } - else - { + } else { attr.setDrawInterior(false); } - + shape.setAttributes(attr); - } - else - { + } else { float alpha = currentPathOpacity >= 10 ? 1f : currentPathOpacity <= 0 ? 0f - : currentPathOpacity / 10f; + : currentPathOpacity / 10f; Color color = null; - if (currentPathColor.equals("Yellow")) - color = new Color(1f, 1f, 0f, alpha); - else if (currentPathColor.equals("Red")) - color = new Color(1f, 0f, 0f, alpha); - else if (currentPathColor.equals("Green")) - color = new Color(0f, 1f, 0f, alpha); - else if (currentPathColor.equals("Blue")) - color = new Color(0f, 0f, 1f, alpha); - - if (currentShape instanceof Polyline) - { - Polyline pl = (Polyline) currentShape; - pl.setColor(color); - pl.setLineWidth(currentPathWidth); - pl.setFollowTerrain(currentFollowTerrain); - pl.setTerrainConformance(currentTerrainConformance); - pl.setNumSubsegments(currentNumSubsegments); - - if (currentPathType.equalsIgnoreCase("linear")) - pl.setPathType(Polyline.LINEAR); - else if (currentPathType.equalsIgnoreCase("rhumb line")) - pl.setPathType(Polyline.RHUMB_LINE); - else - pl.setPathType(Polyline.GREAT_CIRCLE); - - pl.setOffset(currentOffset); - - if (currentPathStyle.equals("Dash")) - { - pl.setStippleFactor(5); - pl.setStipplePattern((short) 0xAAAA); + switch (currentPathColor) { + case "Yellow": + color = new Color(1f, 1f, 0f, alpha); + break; + case "Red": + color = new Color(1f, 0f, 0f, alpha); + break; + case "Green": + color = new Color(0f, 1f, 0f, alpha); + break; + case "Blue": + color = new Color(0f, 0f, 1f, alpha); + break; + default: + break; + } + + if (currentShape instanceof Path) { + Path path = (Path) currentShape; + path.setFollowTerrain(currentFollowTerrain); + if (path.isFollowTerrain()) { + path.setAltitudeMode(WorldWind.CLAMP_TO_GROUND); + } else { + path.setAltitudeMode(WorldWind.ABSOLUTE); + } + path.setTerrainConformance(currentTerrainConformance); + path.setNumSubsegments(currentNumSubsegments); + + if (currentPathType.equalsIgnoreCase("linear")) { + path.setPathType(AVKey.LINEAR); + } else if (currentPathType.equalsIgnoreCase("rhumb line")) { + path.setPathType(AVKey.RHUMB_LINE); + } else { + path.setPathType(AVKey.GREAT_CIRCLE); } - else - { - pl.setStippleFactor(0); // solid + + path.setOffset(currentOffset); + + BasicShapeAttributes attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(color)); + attrs.setInteriorMaterial(new Material(color)); + attrs.setOutlineWidth(currentPathWidth); + attrs.setOutlineOpacity(alpha); + if (currentPathStyle.equals("Dash")) { + attrs.setOutlineStippleFactor(5); + attrs.setOutlineStipplePattern((short) 0xAAAA); + } else { + attrs.setOutlineStippleFactor(0); } + path.setAttributes(attrs); } } this.layer.removeAllRenderables(); - if (this.currentShape != null) + if (this.currentShape != null) { this.layer.addRenderable(this.currentShape); + } this.wwjPanel.getWwd().redraw(); } - - private Info[] buildSurfaceShapes() - { + + private Info[] buildSurfaceShapes() { LatLon position = new LatLon(Angle.fromDegrees(38), Angle.fromDegrees(-105)); - - ArrayList surfaceLinePositions = new ArrayList(); -// surfaceLinePositions.add(LatLon.fromDegrees(37.8484, -119.9754)); -// surfaceLinePositions.add(LatLon.fromDegrees(38.3540, -119.1526)); - -// surfaceLinePositions.add(new LatLon(Angle.fromDegrees(0), Angle.fromDegrees(-150))); -// surfaceLinePositions.add(new LatLon(Angle.fromDegrees(60), Angle.fromDegrees(0))); - + + ArrayList surfaceLinePositions = new ArrayList<>(); surfaceLinePositions.add(position); surfaceLinePositions.add(LatLon.fromDegrees(39, -104)); surfaceLinePositions.add(LatLon.fromDegrees(39, -105)); surfaceLinePositions.add(position); - - return new Info[] - { - new Info("Circle", new SurfaceCircle(position, 100e3)), - new Info("Ellipse", new SurfaceEllipse(position, 100e3, 90e3, Angle.ZERO)), - new Info("Square", new SurfaceSquare(position, 100e3)), - new Info("Quad", new SurfaceQuad(position, 100e3, 60e3, Angle.ZERO)), - new Info("Sector", new SurfaceSector(Sector.fromDegrees(38, 40, -105, -103))), - new Info("Polygon", new SurfacePolygon(surfaceLinePositions)), - }; + + return new Info[]{ + new Info("Circle", new SurfaceCircle(position, 100e3)), + new Info("Ellipse", new SurfaceEllipse(position, 100e3, 90e3, Angle.ZERO)), + new Info("Square", new SurfaceSquare(position, 100e3)), + new Info("Quad", new SurfaceQuad(position, 100e3, 60e3, Angle.ZERO)), + new Info("Sector", new SurfaceSector(Sector.fromDegrees(38, 40, -105, -103))), + new Info("Polygon", new SurfacePolygon(surfaceLinePositions)),}; } - - private Info[] buildFreeShapes() - { + + private Info[] buildFreeShapes() { double elevation = 10e3; - ArrayList positions = new ArrayList(); + ArrayList positions = new ArrayList<>(); positions.add(new Position(Angle.fromDegrees(37.8484), Angle.fromDegrees(-119.9754), elevation)); positions.add(new Position(Angle.fromDegrees(39.3540), Angle.fromDegrees(-110.1526), elevation)); positions.add(new Position(Angle.fromDegrees(38.3540), Angle.fromDegrees(-100.1526), elevation)); - - ArrayList positions2 = new ArrayList(); + + ArrayList positions2 = new ArrayList<>(); positions2.add(new Position(Angle.fromDegrees(0), Angle.fromDegrees(-150), elevation)); positions2.add(new Position(Angle.fromDegrees(25), Angle.fromDegrees(-75), elevation)); positions2.add(new Position(Angle.fromDegrees(50), Angle.fromDegrees(0), elevation)); - - ArrayList positions3 = new ArrayList(); - for (double lat = 42, lon = -100; lat <= 45; lat += .1, lon += .1) - { + + ArrayList positions3 = new ArrayList<>(); + for (double lat = 42, lon = -100; lat <= 45; lat += .1, lon += .1) { positions3.add(new Position(Angle.fromDegrees(lat), Angle.fromDegrees(lon), elevation)); } - - ArrayList positions4 = new ArrayList(); + + ArrayList positions4 = new ArrayList<>(); positions4.add(new Position(Angle.fromDegrees(90), Angle.fromDegrees(-110), elevation)); positions4.add(new Position(Angle.fromDegrees(-90), Angle.fromDegrees(-110), elevation)); - - ArrayList positions5 = new ArrayList(); - for (int i = 0; i < 100; i++) - { + + ArrayList positions5 = new ArrayList<>(); + for (int i = 0; i < 100; i++) { positions5.add(Position.fromDegrees(38.0 + i * 0.0001, 30.0 + i * 0.0001, 1000.0 + i * 5.0)); } - - @SuppressWarnings({"UnnecessaryLocalVariable"}) - Info[] infos = new Info[] - { - new Info("Short Path", new Polyline(positions)), - new Info("Long Path", new Polyline(positions2)), - new Info("Incremental Path", new Polyline(positions3)), - new Info("Vertical Path", new Polyline(positions4)), - new Info("Small-segment Path", new Polyline(positions5)), - new Info("Quad", new Quadrilateral(Sector.fromDegrees(38, 40, -104, -105), elevation)), - new Info("None", null) - }; - + + Info[] infos = new Info[]{ + new Info("Short Path", new Path(positions)), + new Info("Long Path", new Path(positions2)), + new Info("Incremental Path", new Path(positions3)), + new Info("Vertical Path", new Path(positions4)), + new Info("Small-segment Path", new Path(positions5)), + new Info("Quad", new Quadrilateral(Sector.fromDegrees(38, 40, -104, -105), elevation)), + new Info("None", null) + }; + return infos; } - - private JPanel makeShapeSelectionPanel() - { + + private JPanel makeShapeSelectionPanel() { final Info[] surfaceShapeInfos = this.buildSurfaceShapes(); GridLayout layout = new GridLayout(surfaceShapeInfos.length, 1); JPanel ssPanel = new JPanel(layout); ButtonGroup group = new ButtonGroup(); - for (final Info info : surfaceShapeInfos) - { + for (final Info info : surfaceShapeInfos) { JRadioButton b = new JRadioButton(info.name); - b.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentShape = (Renderable) info.object; - update(); - } + b.addActionListener((ActionEvent actionEvent) -> { + currentShape = (Renderable) info.object; + update(); }); group.add(b); ssPanel.add(b); - if (info.name.equalsIgnoreCase("none")) + if (info.name.equalsIgnoreCase("none")) { b.setSelected(true); + } } ssPanel.setBorder(this.createTitleBorder("Surface Shapes")); - + final Info[] freeShapeInfos = this.buildFreeShapes(); layout = new GridLayout(freeShapeInfos.length, 1); JPanel fsPanel = new JPanel(layout); - for (final Info info : freeShapeInfos) - { + for (final Info info : freeShapeInfos) { JRadioButton b = new JRadioButton(info.name); - b.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentShape = (Renderable) info.object; - update(); - } + b.addActionListener((ActionEvent actionEvent) -> { + currentShape = (Renderable) info.object; + update(); }); group.add(b); fsPanel.add(b); - if (info.name.equalsIgnoreCase("none")) + if (info.name.equalsIgnoreCase("none")) { b.setSelected(true); + } } fsPanel.setBorder(this.createTitleBorder("Path Shapes")); - + JPanel shapesPanel = new JPanel(new GridLayout(1, 2, 8, 1)); shapesPanel.add(fsPanel); shapesPanel.add(ssPanel); - + return shapesPanel; } - - private Border createTitleBorder(String title) - { + + private Border createTitleBorder(String title) { TitledBorder b = BorderFactory.createTitledBorder(title); -// b.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); return new CompoundBorder(b, BorderFactory.createEmptyBorder(10, 10, 10, 10)); } - - private JPanel makeAttributesPanel() - { + + private JPanel makeAttributesPanel() { JPanel panel = new JPanel(new GridLayout(1, 2, 8, 8)); panel.add(this.makePathAttributesPanel()); panel.add(this.makeInteriorAttributesPanel()); - + return panel; } - - private JPanel makePathAttributesPanel() - { + + private JPanel makePathAttributesPanel() { JPanel outerPanel = new JPanel(new BorderLayout(6, 6)); outerPanel.setBorder(this.createTitleBorder("Path Attributes")); - + GridLayout nameLayout = new GridLayout(0, 1, 6, 6); JPanel namePanel = new JPanel(nameLayout); - + GridLayout valueLayout = new GridLayout(0, 1, 6, 6); JPanel valuePanel = new JPanel(valueLayout); - + namePanel.add(new JLabel("Follow Terrain")); JCheckBox ckb = new JCheckBox(); ckb.setSelected(currentFollowTerrain); - ckb.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentFollowTerrain = ((JCheckBox) actionEvent.getSource()).isSelected(); - update(); - } + ckb.addActionListener((ActionEvent actionEvent) -> { + currentFollowTerrain = ((JCheckBox) actionEvent.getSource()).isSelected(); + update(); }); valuePanel.add(ckb); - + JLabel label; - + namePanel.add(label = new JLabel("Conformance")); - int[] values = new int[] {1, 2, 4, 8, 10, 15, 20, 30, 40, 50}; + int[] values = new int[]{1, 2, 4, 8, 10, 15, 20, 30, 40, 50}; String[] strings = new String[values.length]; - for (int i = 0; i < values.length; i++) - { + for (int i = 0; i < values.length; i++) { strings[i] = Integer.toString(values[i]) + " pixels"; } JSpinner sp = new JSpinner( - new SpinnerListModel(strings)); + new SpinnerListModel(strings)); onTerrainOnlyItems.add(label); onTerrainOnlyItems.add(sp); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - String v = (String) ((JSpinner) changeEvent.getSource()).getValue(); - currentTerrainConformance = Integer.parseInt(v.substring(0, v.indexOf(" "))); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + String v = (String) ((JSpinner) changeEvent.getSource()).getValue(); + currentTerrainConformance = Integer.parseInt(v.substring(0, v.indexOf(" "))); + update(); }); sp.setValue(Integer.toString(currentTerrainConformance) + " pixels"); valuePanel.add(sp); - + namePanel.add(label = new JLabel("Subsegments")); - sp = new JSpinner(new SpinnerListModel(new String[] {"1", "2", "5", "10", "20", "40", "50"})); + sp = new JSpinner(new SpinnerListModel(new String[]{"1", "2", "5", "10", "20", "40", "50"})); offTerrainOnlyItems.add(label); offTerrainOnlyItems.add(sp); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - String v = (String) ((JSpinner) changeEvent.getSource()).getValue(); - currentNumSubsegments = Integer.parseInt(v); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + String v = (String) ((JSpinner) changeEvent.getSource()).getValue(); + currentNumSubsegments = Integer.parseInt(v); + update(); }); sp.setValue(Integer.toString(currentNumSubsegments)); valuePanel.add(sp); - + namePanel.add(new JLabel("Type")); - final JComboBox cb = new JComboBox(new String[] {"Great Circle", "Linear", "Rhumb Line"}); - cb.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentPathType = (String) cb.getSelectedItem(); - update(); - } + final JComboBox cb = new JComboBox(new String[]{"Great Circle", "Linear", "Rhumb Line"}); + cb.addActionListener((ActionEvent actionEvent) -> { + currentPathType = (String) cb.getSelectedItem(); + update(); }); cb.setSelectedItem("Great Circle"); valuePanel.add(cb); - + namePanel.add(new JLabel("Style")); - final JComboBox cb1 = new JComboBox(new String[] {"None", "Solid", "Dash"}); - cb1.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentPathStyle = (String) cb1.getSelectedItem(); - update(); - } + final JComboBox cb1 = new JComboBox(new String[]{"None", "Solid", "Dash"}); + cb1.addActionListener((ActionEvent actionEvent) -> { + currentPathStyle = (String) cb1.getSelectedItem(); + update(); }); cb1.setSelectedItem("Solid"); valuePanel.add(cb1); - + namePanel.add(new JLabel("Width")); sp = new JSpinner(new SpinnerNumberModel(this.currentPathWidth, 1d, 10d, 1d)); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - currentPathWidth = (Double) ((JSpinner) changeEvent.getSource()).getValue(); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + currentPathWidth = (Double) ((JSpinner) changeEvent.getSource()).getValue(); + update(); }); sp.setValue(currentPathWidth); valuePanel.add(sp); - + namePanel.add(new JLabel("Color")); - JComboBox cb2 = new JComboBox(new String[] {"Red", "Green", "Blue", "Yellow"}); + JComboBox cb2 = new JComboBox(new String[]{"Red", "Green", "Blue", "Yellow"}); cb2.setSelectedItem(currentPathColor); - cb2.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentPathColor = (String) ((JComboBox) actionEvent.getSource()).getSelectedItem(); - update(); - } + cb2.addActionListener((ActionEvent actionEvent) -> { + currentPathColor = (String) ((JComboBox) actionEvent.getSource()).getSelectedItem(); + update(); }); valuePanel.add(cb2); - + namePanel.add(new JLabel("Opacity")); sp = new JSpinner(new SpinnerNumberModel(this.currentPathOpacity, 0, 10, 1)); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - currentPathOpacity = (Integer) ((JSpinner) changeEvent.getSource()).getValue(); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + currentPathOpacity = (Integer) ((JSpinner) changeEvent.getSource()).getValue(); + update(); }); valuePanel.add(sp); - + namePanel.add(new JLabel("Offset")); sp = new JSpinner( - new SpinnerListModel(new String[] {"0", "10", "100", "1000", "10000", "100000", "1000000"})); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - currentOffset = Float.parseFloat((String) ((JSpinner) changeEvent.getSource()).getValue()); - update(); - } + new SpinnerListModel(new String[]{"0", "10", "100", "1000", "10000", "100000", "1000000"})); + sp.addChangeListener((ChangeEvent changeEvent) -> { + currentOffset = Float.parseFloat((String) ((JSpinner) changeEvent.getSource()).getValue()); + update(); }); sp.setValue("0"); valuePanel.add(sp); - + outerPanel.add(namePanel, BorderLayout.WEST); outerPanel.add(valuePanel, BorderLayout.CENTER); - + return outerPanel; } - - private JPanel makeInteriorAttributesPanel() - { + + private JPanel makeInteriorAttributesPanel() { JPanel outerPanel = new JPanel(new BorderLayout(6, 6)); outerPanel.setBorder(this.createTitleBorder("Surface Attributes")); - + GridLayout nameLayout = new GridLayout(0, 1, 6, 6); JPanel namePanel = new JPanel(nameLayout); - + GridLayout valueLayout = new GridLayout(0, 1, 6, 6); JPanel valuePanel = new JPanel(valueLayout); - + namePanel.add(new JLabel("Style")); - final JComboBox cb1 = new JComboBox(new String[] {"None", "Solid"}); - cb1.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentInteriorStyle = (String) cb1.getSelectedItem(); - update(); - } + final JComboBox cb1 = new JComboBox(new String[]{"None", "Solid"}); + cb1.addActionListener((ActionEvent actionEvent) -> { + currentInteriorStyle = (String) cb1.getSelectedItem(); + update(); }); cb1.setSelectedItem("Solid"); valuePanel.add(cb1); - + namePanel.add(new JLabel("Opacity")); JSpinner sp = new JSpinner(new SpinnerNumberModel(this.currentBorderOpacity, 0, 10, 1)); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - currentInteriorOpacity = (Integer) ((JSpinner) changeEvent.getSource()).getValue(); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + currentInteriorOpacity = (Integer) ((JSpinner) changeEvent.getSource()).getValue(); + update(); }); valuePanel.add(sp); - + namePanel.add(new JLabel("Color")); - final JComboBox cb2 = new JComboBox(new String[] {"Red", "Green", "Blue", "Yellow"}); + final JComboBox cb2 = new JComboBox(new String[]{"Red", "Green", "Blue", "Yellow"}); cb2.setSelectedItem(currentInteriorColor); - cb2.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentInteriorColor = (String) ((JComboBox) actionEvent.getSource()).getSelectedItem(); - update(); - } + cb2.addActionListener((ActionEvent actionEvent) -> { + currentInteriorColor = (String) ((JComboBox) actionEvent.getSource()).getSelectedItem(); + update(); }); valuePanel.add(cb2); - + namePanel.add(new JLabel("Border")); - final JComboBox cb5 = new JComboBox(new String[] {"None", "Solid"}); - cb5.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentBorderStyle = (String) cb5.getSelectedItem(); - update(); - } + final JComboBox cb5 = new JComboBox(new String[]{"None", "Solid"}); + cb5.addActionListener((ActionEvent actionEvent) -> { + currentBorderStyle = (String) cb5.getSelectedItem(); + update(); }); cb5.setSelectedItem("Solid"); valuePanel.add(cb5); - + namePanel.add(new JLabel("Border Width")); sp = new JSpinner(new SpinnerNumberModel(this.currentBorderWidth, 1d, 10d, 1d)); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - currentBorderWidth = (Double) ((JSpinner) changeEvent.getSource()).getValue(); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + currentBorderWidth = (Double) ((JSpinner) changeEvent.getSource()).getValue(); + update(); }); sp.setValue(currentBorderWidth); valuePanel.add(sp); - + namePanel.add(new JLabel("Border Color")); - JComboBox cb4 = new JComboBox(new String[] {"Red", "Green", "Blue", "Yellow"}); + JComboBox cb4 = new JComboBox(new String[]{"Red", "Green", "Blue", "Yellow"}); cb4.setSelectedItem(currentBorderColor); - cb4.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - currentBorderColor = (String) ((JComboBox) actionEvent.getSource()).getSelectedItem(); - update(); - } + cb4.addActionListener((ActionEvent actionEvent) -> { + currentBorderColor = (String) ((JComboBox) actionEvent.getSource()).getSelectedItem(); + update(); }); valuePanel.add(cb4); - + namePanel.add(new JLabel("Border Opacity")); sp = new JSpinner(new SpinnerNumberModel(this.currentBorderOpacity, 0, 10, 1)); - sp.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent changeEvent) - { - currentBorderOpacity = (Integer) ((JSpinner) changeEvent.getSource()).getValue(); - update(); - } + sp.addChangeListener((ChangeEvent changeEvent) -> { + currentBorderOpacity = (Integer) ((JSpinner) changeEvent.getSource()).getValue(); + update(); }); valuePanel.add(sp); - + outerPanel.add(namePanel, BorderLayout.WEST); outerPanel.add(valuePanel, BorderLayout.CENTER); - + return outerPanel; } - - private void setupSelection() - { - this.wwjPanel.getWwd().addSelectListener(new SelectListener() - { + + private void setupSelection() { + this.wwjPanel.getWwd().addSelectListener(new SelectListener() { private WWIcon lastToolTipIcon = null; - private BasicDragger dragger = new BasicDragger(AppFrame.this.wwjPanel.getWwd()); - - public void selected(SelectEvent event) - { + private final BasicDragger dragger = new BasicDragger(AppFrame.this.wwjPanel.getWwd()); + + @Override + public void selected(SelectEvent event) { // Have hover selections show a picked icon's tool tip. - if (event.getEventAction().equals(SelectEvent.HOVER)) - { + if (event.getEventAction().equals(SelectEvent.HOVER)) { // If a tool tip is already showing, undisplay it. - if (lastToolTipIcon != null) - { + if (lastToolTipIcon != null) { lastToolTipIcon.setShowToolTip(false); this.lastToolTipIcon = null; AppFrame.this.wwjPanel.getWwd().redraw(); } // If there's a selection, we're not dragging, and the selection is an icon, show tool tip. - if (event.hasObjects() && !this.dragger.isDragging()) - { - if (event.getTopObject() instanceof WWIcon) - { + if (event.hasObjects() && !this.dragger.isDragging()) { + if (event.getTopObject() instanceof WWIcon) { this.lastToolTipIcon = (WWIcon) event.getTopObject(); lastToolTipIcon.setShowToolTip(true); AppFrame.this.wwjPanel.getWwd().redraw(); } } - } - // Have rollover events highlight the rolled-over object. - else if (event.getEventAction().equals(SelectEvent.ROLLOVER) && !this.dragger.isDragging()) - { + } // Have rollover events highlight the rolled-over object. + else if (event.getEventAction().equals(SelectEvent.ROLLOVER) && !this.dragger.isDragging()) { // AppFrame.this.highlight(event.getTopObject()); - } - - // Have drag events drag the selected object. + } // Have drag events drag the selected object. else if (event.getEventAction().equals(SelectEvent.DRAG_END) - || event.getEventAction().equals(SelectEvent.DRAG)) - { + || event.getEventAction().equals(SelectEvent.DRAG)) { // Delegate dragging computations to a dragger. this.dragger.selected(event); // We missed any roll-over events while dragging, so highlight any under the cursor now, // or de-highlight the dragged shape if it's no longer under the cursor. - if (event.getEventAction().equals(SelectEvent.DRAG_END)) - { + if (event.getEventAction().equals(SelectEvent.DRAG_END)) { PickedObjectList pol = wwjPanel.getWwd().getObjectsAtCurrentPosition(); - if (pol != null) - { + if (pol != null) { // AppFrame.this.highlight(pol.getTopObject()); AppFrame.this.wwjPanel.getWwd().redraw(); } @@ -703,30 +635,24 @@ else if (event.getEventAction().equals(SelectEvent.DRAG_END) }); } } - - private static final String APP_NAME = "World Wind Shapes"; - - static - { - if (Configuration.isMacOS()) - { + + private static final String APP_NAME = "WorldWind Shapes"; + + static { + if (Configuration.isMacOS()) { System.setProperty("apple.laf.useScreenMenuBar", "true"); System.setProperty("com.apple.mrj.application.apple.menu.about.name", APP_NAME); System.setProperty("com.apple.mrj.application.growbox.intrudes", "false"); } } - - public static void main(String[] args) - { - try - { + + public static void main(String[] args) { + try { AppFrame frame = new AppFrame(); frame.setTitle(APP_NAME); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setVisible(true); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/gov/nasa/worldwindx/examples/Shutdown.java b/src/gov/nasa/worldwindx/examples/Shutdown.java index 7259b22109..e7480b73d0 100644 --- a/src/gov/nasa/worldwindx/examples/Shutdown.java +++ b/src/gov/nasa/worldwindx/examples/Shutdown.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -14,7 +36,7 @@ import java.awt.event.*; /** - * Shows how to shut down a {@link WorldWindow} and how to shut down all of World Wind. + * Shows how to shut down a {@link WorldWindow} and how to shut down all of WorldWind. * * @author tag * @version $Id: Shutdown.java 1171 2013-02-11 21:45:02Z dcollins $ @@ -109,7 +131,7 @@ private class ShutdownWorldWindAction extends AbstractAction { public ShutdownWorldWindAction() { - super("Shutdown World Wind"); + super("Shutdown WorldWind"); } public void actionPerformed(ActionEvent e) @@ -125,7 +147,7 @@ public static void main(String[] args) { if (Configuration.isMacOS()) { - System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Shutdown World Wind"); + System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Shutdown WorldWind"); } java.awt.EventQueue.invokeLater(new Runnable() diff --git a/src/gov/nasa/worldwindx/examples/SimpleShapeDragging.java b/src/gov/nasa/worldwindx/examples/SimpleShapeDragging.java index 6a68e5debd..2fbaf576b3 100644 --- a/src/gov/nasa/worldwindx/examples/SimpleShapeDragging.java +++ b/src/gov/nasa/worldwindx/examples/SimpleShapeDragging.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/SimplestPossibleExample.java b/src/gov/nasa/worldwindx/examples/SimplestPossibleExample.java index 25439133a9..14a468c224 100644 --- a/src/gov/nasa/worldwindx/examples/SimplestPossibleExample.java +++ b/src/gov/nasa/worldwindx/examples/SimplestPossibleExample.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; diff --git a/src/gov/nasa/worldwindx/examples/SplitPaneUsage.java b/src/gov/nasa/worldwindx/examples/SplitPaneUsage.java index 5eb99f8d29..0e949aad7b 100644 --- a/src/gov/nasa/worldwindx/examples/SplitPaneUsage.java +++ b/src/gov/nasa/worldwindx/examples/SplitPaneUsage.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -17,11 +39,11 @@ import java.awt.*; /** - * Illustrates how to use World Wind within a Swing JSplitPane. Doing so is mostly straightforward, but in order to work + * Illustrates how to use WorldWind within a Swing JSplitPane. Doing so is mostly straightforward, but in order to work * around a Swing bug the WorldWindow must be placed within a JPanel and that JPanel's minimum preferred size must be * set to zero (both width and height). See the code that does this in the first few lines of the AppPanel constructor * below. - *

                + *

                * This example also illustrates another bug in Swing that does not have a known workaround: the WorldWindow does not * resize when a vertical split-pane's one-touch-expand widget is clicked if that split-pane contains a horizontal * split-plane that contains the WorldWindow. If the one-touch widget is clicked on the bottom pane of this example, @@ -125,7 +147,7 @@ public AppFrame() public static void main(String[] args) { - start("World Wind Split Pane Usage"); + start("WorldWind Split Pane Usage"); } public static void start(String appName) diff --git a/src/gov/nasa/worldwindx/examples/Stereo.java b/src/gov/nasa/worldwindx/examples/Stereo.java index c55549b09a..1078299385 100644 --- a/src/gov/nasa/worldwindx/examples/Stereo.java +++ b/src/gov/nasa/worldwindx/examples/Stereo.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -31,6 +53,6 @@ public static void main(String[] args) Configuration.setValue(AVKey.INITIAL_HEADING, 342); Configuration.setValue(AVKey.INITIAL_PITCH, 80); - ApplicationTemplate.start("World Wind Anaglyph Stereo", AppFrame.class); + ApplicationTemplate.start("WorldWind Anaglyph Stereo", AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/SurfaceImageViewer.java b/src/gov/nasa/worldwindx/examples/SurfaceImageViewer.java index 0a0cfb2b4a..5d8dc81fd6 100644 --- a/src/gov/nasa/worldwindx/examples/SurfaceImageViewer.java +++ b/src/gov/nasa/worldwindx/examples/SurfaceImageViewer.java @@ -1,7 +1,29 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; @@ -18,18 +40,18 @@ /** * Open and view arbitrary surface images and elevations that have an accompanying world file. - *

                + *

                * After clicking the open button and selecting the desired image or elevations file, the program status will change to * Loading while WorldWind installs the selected data. Wait until the status changes to Ready. The data will have * finished installing and will be ready for viewing. - *

                + *

                * Image and elevation files that you wish to load must be accompanied by a world file, or they will fail to load. The * world file can be identified as the file with a file extension consisting of three letters. The first two of these * will be the first and last letters of the image or elevation file type, e.g. tf for a tiff file, or jg for a jpeg * file. The last letter will be a double. - *

                + *

                * For example, a world file accompanying a jpeg file would have the extension .jgw : - *

                + *

                * image.jpg // image file * image.jgw // accompanying world file * @@ -175,6 +197,6 @@ public void stateChanged(ChangeEvent e) public static void main(String[] args) { - ApplicationTemplate.start("World Wind Surface Images", SurfaceImageViewer.AppFrame.class); + ApplicationTemplate.start("WorldWind Surface Images", SurfaceImageViewer.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/SurfaceImages.java b/src/gov/nasa/worldwindx/examples/SurfaceImages.java index 8964b87f6e..7d6ff88c16 100644 --- a/src/gov/nasa/worldwindx/examples/SurfaceImages.java +++ b/src/gov/nasa/worldwindx/examples/SurfaceImages.java @@ -1,10 +1,33 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; +import gov.nasa.worldwind.avlist.AVKey; import gov.nasa.worldwind.formats.tiff.GeotiffImageReaderSpi; import gov.nasa.worldwind.geom.LatLon; import gov.nasa.worldwind.layers.RenderableLayer; @@ -21,10 +44,9 @@ * @author tag * @version $Id: SurfaceImages.java 2109 2014-06-30 16:52:38Z tgaskins $ */ -public class SurfaceImages extends ApplicationTemplate -{ - static - { +public class SurfaceImages extends ApplicationTemplate { + + static { IIORegistry reg = IIORegistry.getDefaultInstance(); reg.registerServiceProvider(GeotiffImageReaderSpi.inst()); } @@ -32,37 +54,39 @@ public class SurfaceImages extends ApplicationTemplate protected static final String GEORSS_ICON_PATH = "gov/nasa/worldwindx/examples/images/georss.png"; protected static final String TEST_PATTERN = "gov/nasa/worldwindx/examples/images/antenna.png"; - public static class AppFrame extends ApplicationTemplate.AppFrame - { - public AppFrame() - { + public static class AppFrame extends ApplicationTemplate.AppFrame { + + public AppFrame() { super(true, true, false); - try - { - SurfaceImage si1 = new SurfaceImage(GEORSS_ICON_PATH, new ArrayList(Arrays.asList( - LatLon.fromDegrees(20d, -115d), - LatLon.fromDegrees(20d, -105d), - LatLon.fromDegrees(32d, -102d), - LatLon.fromDegrees(30d, -115d) + try { + SurfaceImage si1 = new SurfaceImage(GEORSS_ICON_PATH, new ArrayList<>(Arrays.asList( + LatLon.fromDegrees(20d, -115d), + LatLon.fromDegrees(20d, -105d), + LatLon.fromDegrees(32d, -102d), + LatLon.fromDegrees(30d, -115d) ))); - SurfaceImage si2 = new SurfaceImage(TEST_PATTERN, new ArrayList(Arrays.asList( - LatLon.fromDegrees(37.8677, -105.1668), - LatLon.fromDegrees(37.8677, -104.8332), - LatLon.fromDegrees(38.1321, -104.8326), - LatLon.fromDegrees(38.1321, -105.1674) + SurfaceImage si2 = new SurfaceImage(TEST_PATTERN, new ArrayList<>(Arrays.asList( + LatLon.fromDegrees(37.8677, -105.1668), + LatLon.fromDegrees(37.8677, -104.8332), + LatLon.fromDegrees(38.1321, -104.8326), + LatLon.fromDegrees(38.1321, -105.1674) ))); - Polyline boundary = new Polyline(si1.getCorners(), 0); - boundary.setFollowTerrain(true); - boundary.setClosed(true); - boundary.setPathType(Polyline.RHUMB_LINE); - boundary.setColor(new Color(0, 255, 0)); + Path boundary = new Path(si1.getCorners(), 0); + boundary.setSurfacePath(true); + boundary.setPathType(AVKey.RHUMB_LINE); + var attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(new Color(0, 255, 0))); + boundary.setAttributes(attrs); + boundary.makeClosed(); - Polyline boundary2 = new Polyline(si2.getCorners(), 0); - boundary2.setFollowTerrain(true); - boundary2.setClosed(true); - boundary2.setPathType(Polyline.RHUMB_LINE); - boundary2.setColor(new Color(0, 255, 0)); + Path boundary2 = new Path(si2.getCorners(), 0); + boundary2.setSurfacePath(true); + boundary2.setPathType(AVKey.RHUMB_LINE); + attrs = new BasicShapeAttributes(); + attrs.setOutlineMaterial(new Material(new Color(0, 255, 0))); + boundary2.setAttributes(attrs); + boundary2.makeClosed(); RenderableLayer layer = new RenderableLayer(); layer.setName("Surface Images"); @@ -73,16 +97,13 @@ public AppFrame() layer.addRenderable(boundary2); insertBeforeCompass(this.getWwd(), layer); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } } } - public static void main(String[] args) - { - ApplicationTemplate.start("World Wind Surface Images", SurfaceImages.AppFrame.class); + public static void main(String[] args) { + ApplicationTemplate.start("WorldWind Surface Images", SurfaceImages.AppFrame.class); } } diff --git a/src/gov/nasa/worldwindx/examples/SurfaceShapes.java b/src/gov/nasa/worldwindx/examples/SurfaceShapes.java index 6444daf7ca..b113fddb1f 100644 --- a/src/gov/nasa/worldwindx/examples/SurfaceShapes.java +++ b/src/gov/nasa/worldwindx/examples/SurfaceShapes.java @@ -1,15 +1,36 @@ /* - * Copyright (C) 2012 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. - * All Rights Reserved. + * Copyright 2006-2009, 2017, 2020 United States Government, as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All rights reserved. + * + * The NASA World Wind Java (WWJ) platform is licensed under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * NASA World Wind Java (WWJ) also contains the following 3rd party Open Source + * software: + * + * Jackson Parser – Licensed under Apache 2.0 + * GDAL – Licensed under MIT + * JOGL – Licensed under Berkeley Software Distribution (BSD) + * Gluegen – Licensed under Berkeley Software Distribution (BSD) + * + * A complete listing of 3rd Party software notices and licenses included in + * NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party + * notices and licenses PDF found in code directory. */ package gov.nasa.worldwindx.examples; /** - * Illustrates how to configure and display World Wind {@link gov.nasa.worldwind.render.SurfaceShape}s. + * Illustrates how to configure and display WorldWind {@link gov.nasa.worldwind.render.SurfaceShape}s. * Surface shapes are used to visualize flat standard shapes types that follow the terrain. This illustrates how to use * all 7 standard surface shape types: - *

                *