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 0000000000..50747cf232 Binary files /dev/null and b/Apache License 2.0.pdf differ 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

@@ -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. 
+ * 
        2. 
+ * Call {@link gov.nasa.worldwind.ogc.collada.ColladaRoot#parse(Object[])} to parse the document.
+ * 
          3. 
+ * 
        3. 
+ * 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.
+ * 
          4. 
+ * 
        4. 
+ * 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.
+ * 
          5. 
+ * 
        
+ *
+
        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. 
-    
        2. 
-        Call {@link gov.nasa.worldwind.ogc.collada.ColladaRoot#parse(Object[])} to parse the document.
-    
          3. 
-    
        3. 
-        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.
-    
          4. 
-    
        4. 
-        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.
-    
          5. 
-
        
-
-
        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. 
+ * 
        2. 
+ * Call {@link gov.nasa.worldwind.ogc.kml.KMLRoot#parse(Object[])} to parse the document.
+ * 
          3. 
+ * 
        3. 
+ * 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.
+ * 
          4. 
+ * 
        4. 
+ * 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.
+ * 
          5. 
+ * 
        
+ * 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. 
-    
        2. 
-        Call {@link gov.nasa.worldwind.ogc.kml.KMLRoot#parse(Object[])} to parse the document.
-    
          3. 
-    
        3. 
-        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.
-    
          4. 
-    
        4. 
-        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.
-    
          5. 
-
        
-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.  
        2. Copy the original image contents
+ * computing power-of-two dimensions:  

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

                      
          3.  
        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();
           }

           
          4.  
         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:
- * 
                
  *