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 @@
-
-
-
- toString() that would be the representation returned.
### Code Formatting
-* Use the code formatting and style that's in the IDEA project file. It makes it possible to review previous code
+* Use the code formatting and style that's in the NetBeans project file. It makes it possible to review previous code
modifications.
-* Use the code formatting rules specified in WorldWindJ.ipr. They are in the project file under (Settings Project
-Settings Project Code Style). To apply them, simply use Code Auto-indent Lines. You can also just check the box
-at Subversion check-in time and the formatting will be applied before check-in. Be sure the formatting rules are
-not overridden in your IDEA workspace.
-* We generally use the traditional Sun coding conventions. Constants are in all upper case with words separated by
+* 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.
-* Set up IDEA to automatically place the standard project header in newly created files by putting the following
-as the File Header in the Includes tab of IDEA in the File Templates dialog:
/* Copyright (C)
-2001, 2011 United States Government as represented by
the Administrator of the National Aeronautics and
-Space Administration.
All Rights Reserved.
*/
package ${PACKAGE_NAME};
/**
* @author
-${USER}
* @version $Id: Design and Coding Guidelines.html 1171 2013-02-11 21:45:02Z dcollins $
*/
-
Then remove the package name property from first line of the Class and Interface items of the Templates tab
-in the File Templates dialog. (The package name is in the "include" now, so it gets inserted after the
-copyright.) Test it out by creating a dummy class. Unfortunately this set-up is a personal configuration in
-IDEA, not project specific.
-* When creating a new file, the Id subversion keyword has to be explicitly set via Version Control --> Set
-Property --> Property name: svn:keywords, and the term Id included in the text box. If the property is not
-included in this list then Subversion doesn't replace the property string when updating the file.
-* Resolve all IDEA warnings before checking in a file. If the warning refers to an intentional case, add an
+* Resolve all NetBeans warnings before checking in a file. If the warning refers to an intentional case, add an
exception statement.
### Internationalization (i18n)
@@ -191,7 +178,6 @@ WorldWind team and community understand your report, reproduce the behavior, and
#### Before Submitting a Bug Report
-* Check the [**WorldWind Forum**](https://forum.worldwindcentral.com/forum/world-wind-java-forums).
* 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.
@@ -256,7 +242,5 @@ in the appropriate repository and provide the following information:
For WorldWind Java tutorials and examples, please check out our website: https://worldwind.arc.nasa.gov/.
-For community support and FAQs, check out the WorldWind Forum: https://forum.worldwindcentral.com/.
-
-To reach our Administrative Contact, please email: [patrick.hogan@nasa.gov](mailto:patrick.hogan@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 089a37e149..7322401b0a 100644
--- a/Design and Coding Guidelines.html
+++ b/Design and Coding Guidelines.html
@@ -1,10 +1,33 @@
-
+Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
+Administrator of the National Aeronautics and Space Administration.
+All rights reserved.
+
+The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
+software:
+
+ Jackson Parser – Licensed under Apache 2.0
+ GDAL – Licensed under MIT
+ JOGL – Licensed under Berkeley Software Distribution (BSD)
+ Gluegen – Licensed under Berkeley Software Distribution (BSD)
+
+A complete listing of 3rd Party software notices and licenses included in
+NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party
+notices and licenses PDF found in code directory.
+
+-->
+
/* Copyright (C)
- 2001, 2011 United
- States Government
- as represented by
-
the Administrator of the National Aeronautics and Space Administration.
All Rights Reserved.
*/
package
- ${PACKAGE_NAME};
-
/**
* @author ${USER}
* @version $Id: Design and Coding Guidelines.html 1171 2013-02-11 21:45:02Z dcollins $
*/
-
- - Then remove the package name property from first line of the Class and Interface items of the Templates tab - in the File Templates dialog. (The package name is in the "include" now, so it gets inserted after the - copyright.) Test it out by creating a dummy class. Unfortunately this set-up is a personal configuration in - IDEA, not project specific.
NASA WORLDWIND - -Copyright © 2004-2005 United States Government as represented by the Administrator of the National
- Aeronautics and Space Administration. 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) - - 1. DEFINITIONS - -A. "Contributor" means Government Agency, as the developer of the Original Software,
- and any entity that makes a Modification. - - 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 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 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 B. Each Recipient must ensure that the following copyright notice appears prominently
- in the Subject Software: 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 |
-