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.
+ +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.
+
/* 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.
-# World Wind Java
+# WorldWind Java
[](https://travis-ci.org/NASAWorldWind/WorldWindJava)
3D virtual globe API for desktop Java, developed by NASA. Provides a geographic context with high-resolution terrain, for visualizing geographic or geo-located information in 3D and 2D. Developers can customize the globe's terrain and imagery. Provides a collection of shapes for displaying and interacting with geographic data and representing a range of geometric objects.
- [worldwind.arc.nasa.gov](https://worldwind.arc.nasa.gov) has setup instructions, developers guides, API documentation and more
-- [World Wind Forum](https://forum.worldwindcentral.com) provides help from the World Wind community
-- [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA World Wind development team
+- [WorldWind Forum](https://forum.worldwindcentral.com) provides help from the WorldWind community
+- [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA WorldWind development team
## Releases and Roadmap
-Official World Wind Java releases have the latest stable features, enhancements and bug fixes ready for production use.
+Official WorldWind Java releases have the latest stable features, enhancements and bug fixes ready for production use.
- [GitHub Releases](https://github.com/NASAWorldWind/WorldWindJava/releases/) documents official releases
- [GitHub Milestones](https://github.com/NASAWorldWind/WorldWindJava/milestones) documents upcoming releases and the development roadmap
@@ -22,7 +22,7 @@ Official World Wind Java releases have the latest stable features, enhancements
###### From a Web Browser
-- [World Wind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows World Wind's basic capabilities
+- [WorldWind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows WorldWind's basic capabilities
- [Java Demos](https://goworldwind.org/demos) has a complete list of example apps
###### From a Windows Development Environment
@@ -30,7 +30,7 @@ Official World Wind Java releases have the latest stable features, enhancements
- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
- Open the Command Prompt
```bash
-cd [World Wind release]
+cd [WorldWind release]
run-demo.bat
```
@@ -39,13 +39,13 @@ run-demo.bat
- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
- Open the Terminal app
```bash
-cd [World Wind release]
+cd [WorldWind release]
sh run-demo.bash
```
###### Troubleshooting
-World Wind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date
+WorldWind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date
graphics drivers. On Windows, visit your graphics card manufacturer's web site for the latest driver: NVIDIA, ATI or
Intel. The drivers are typically under a link named Downloads or Support. If you're using a laptop, the latest drivers
are found at the laptop manufacturer's web site.
@@ -53,7 +53,7 @@ are found at the laptop manufacturer's web site.
## JOGL Native Binaries
JOGL performs runtime extraction of native binaries. Some deployment situations may not allow this because it extracts
-the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying World Wind
+the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying WorldWind
Java's JOGL distribution to load native binaries directly from the library path instead of dynamically using the native
binary JAR files as follows:
@@ -69,7 +69,7 @@ binary JAR files as follows:
## License
- NASA WORLD WIND
+ NASA WORLDWIND
Copyright (C) 2001 United States Government
as represented by the Administrator of the
@@ -90,7 +90,7 @@ binary JAR files as follows:
Government Agency: National Aeronautics and Space Administration (NASA)
Government Agency Original Software Designation: ARC-15166-1
- Government Agency Original Software Title: NASA World Wind
+ Government Agency Original Software Title: NASA WorldWind
User Registration Requested. Please send email with your contact information to Patrick.Hogan@nasa.gov
Government Agency Point of Contact for Original Software: Patrick.Hogan@nasa.gov
diff --git a/README_DEVELOPER.txt b/README_DEVELOPER.txt
index e63d0a7f20..beb384655a 100644
--- a/README_DEVELOPER.txt
+++ b/README_DEVELOPER.txt
@@ -6,23 +6,23 @@
# $Id: README_DEVELOPER.txt 1934 2014-04-15 19:24:07Z dcollins $
-This document provides notes and instructions for World Wind Java development team members in one place.
+This document provides notes and instructions for WorldWind Java development team members in one place.
JOGL Library Overview
------------------------------------------------------------
-The JOGL library provides World Wind Java with (1) a Java binding to the OpenGL API, and (2) OpenGL contexts compatible
+The JOGL library provides WorldWind Java with (1) a Java binding to the OpenGL API, and (2) OpenGL contexts compatible
with Java's AWT and Swing windowing toolkits:
http://jogamp.org/jogl/www/
-World Wind Java uses JOGL v2.1.5, released on 11 March 2014 and downloaded from:
+WorldWind Java uses JOGL v2.1.5, released on 11 March 2014 and downloaded from:
http://jogamp.org/deployment/v2.1.5/archive/jogamp-all-platforms.7z
-The JOGL library compiled JAR files and README files are checked into the World Wind Java source, distributed with all
-World Wind Java builds and included in the World Wind Java Web Start deployment. This is necessary in order ensure
-correct operation of World Wind Java, as changes in JOGL are occasionally unstable or incompatible with previous
-versions. Additionally, World Wind Java's copy of the JOGL JAR files are modified to enable Web Start deployment outside
+The JOGL library compiled JAR files and README files are checked into the WorldWind Java source, distributed with all
+WorldWind Java builds and included in the WorldWind Java Web Start deployment. This is necessary in order ensure
+correct operation of WorldWind Java, as changes in JOGL are occasionally unstable or incompatible with previous
+versions. Additionally, WorldWind Java's copy of the JOGL JAR files are modified to enable Web Start deployment outside
of the jogamp.org domain.
@@ -33,7 +33,7 @@ Updating the JOGL Library
packages are organized by version at the following URL:
http://jogamp.org/deployment/
-2) Extract the archive, then copy the following 15 files to the World Wind Java project root:
+2) Extract the archive, then copy the following 15 files to the WorldWind Java project root:
gluegen-rt-natives-linux-amd64.jar
gluegen-rt-natives-linux-i586.jar
gluegen-rt-natives-macosx-universal.jar
@@ -51,7 +51,7 @@ jogl.LICENSE.txt
jogl.README.txt
3) Remove the Codebase manifest attribute from all JOGL JAR files. This step enables the JOGL JAR files to be
-deployed via the World Wind Java Web Start site:
+deployed via the WorldWind Java Web Start site:
- Run the ANT task jogl.jarfiles.unpack. This task extracts the contents of all 12 GlueGen and JOGL JAR files into
individual folders under jogl-jarfiles.
- For each JAR file folder under jogl-jarfiles open the file META-INF/MANIFEST.MF, delete the line
diff --git a/VPF_README.txt b/VPF_README.txt
index b3416ab5fa..c54a829319 100644
--- a/VPF_README.txt
+++ b/VPF_README.txt
@@ -12,7 +12,7 @@ to build it.
1) PURPOSE OF VPF-SYMBOLS.JAR
-The JAR file vpf-symbols.jar found in the World Wind Java SDK contains style definitions and PNG icons for Vector
+The JAR file vpf-symbols.jar found in the WorldWind Java SDK contains style definitions and PNG icons for Vector
Product Format (VPF) shapes. vpf-symbols.jar is 1.8 MB in size, and is therefore distributed separately to avoid
increasing the size of worldwind.jar for the sake of supporting VPF, an uncommonly used feature.
@@ -25,17 +25,17 @@ GeoSym: http://www.gwg.nga.mil/pfg_documents.php
2) USING VPF-SYMBOLS.JAR
The JAR file vpf-symbols.jar must be distributed and included in the runtime class-path by applications using the World
-Wind class gov.nasa.worldwind.formats.vpf.VPFLayer. When added to an application's class-path, World Wind VPF shapes
+Wind class gov.nasa.worldwind.formats.vpf.VPFLayer. When added to an application's class-path, WorldWind VPF shapes
automatically find and locate style and icon resources contained within this JAR file.
-If vpf-symbols.jar is not in the Java class-path, VPFLayer outputs the following message in the World Wind log:
+If vpf-symbols.jar is not in the Java class-path, VPFLayer outputs the following message in the WorldWind log:
"WARNING: GeoSym style support is disabled". In this case, VPF shapes are displayed as gray outlines, and icons are
displayed as a gray question mark.
3) BUILDING VPF-SYMBOLS.JAR
-To build or reconstruct the VPF symbols JAR file for the World Wind Java SDK, follow these six steps:
+To build or reconstruct the VPF symbols JAR file for the WorldWind Java SDK, follow these six steps:
- Download and extract the GeoSym Second Edition package.
Download the GeoSym archive from the National Geospatial-Intelligence Agency (NGA) at the following page, then extract
@@ -60,7 +60,7 @@ on ImageIO.
- Copy all GeoSym style tables.
Copy all files under the directory GeoSymEd2Final/SYMASGN/ASCII to the directory geosym/symasgn/ascii.
-- Convert GeoSym line and area styles to World Wind shape attributes.
+- Convert GeoSym line and area styles to WorldWind shape attributes.
Run the Java application gov.nasa.worldwind.formats.vpf.GeoSymAttributeConverter from the shell, passing the full path
to GeoSymEd2Final/GRAPHICS/TEXT as the application's only parameter. Copy the output PNG files under
gsac-out/geosym/graphics/bin to the following directory created earlier: geosym/graphics/bin. Copy the output CSV files
diff --git a/build.macros.xml b/build.macros.xml
index c7e3a91884..f7b257f286 100644
--- a/build.macros.xml
+++ b/build.macros.xml
@@ -13,7 +13,7 @@
on the current machine, resulting in unpredictable class versions.
The javac compiler argument '-Xlint:unchecked' is specified in order to give more detail for unchecked
- conversion warnings. This argument is specified in the World Wind Java IntelliJ IDEA project. Its use here
+ conversion warnings. This argument is specified in the WorldWind Java IntelliJ IDEA project. Its use here
keeps ANT compiled classes in sync with the IntelliJ IDEA compiled classes. -->
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.
*
@@ -54,7 +54,7 @@
* 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.
*
@@ -644,7 +644,7 @@ 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:
*
@@ -659,7 +659,7 @@ public static GLProfile getMaxCompatibleGLProfile()
}
/**
- * Returns a {@link javax.media.opengl.GLCapabilities} identifying graphics features required by World Wind. The
+ * Returns a {@link javax.media.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/StereoOptionSceneController.java b/src/gov/nasa/worldwind/StereoOptionSceneController.java
index aabc28e2b8..e2e312bc8b 100644
--- a/src/gov/nasa/worldwind/StereoOptionSceneController.java
+++ b/src/gov/nasa/worldwind/StereoOptionSceneController.java
@@ -35,7 +35,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.
*/
diff --git a/src/gov/nasa/worldwind/Version.java b/src/gov/nasa/worldwind/Version.java
index 9f588792a5..351da32149 100644
--- a/src/gov/nasa/worldwind/Version.java
+++ b/src/gov/nasa/worldwind/Version.java
@@ -16,7 +16,7 @@ public class Version
private static final String MINOR_VALUE = "1";
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()
{
diff --git a/src/gov/nasa/worldwind/View.java b/src/gov/nasa/worldwind/View.java
index 55febe104c..fbbae7b5cc 100644
--- a/src/gov/nasa/worldwind/View.java
+++ b/src/gov/nasa/worldwind/View.java
@@ -262,7 +262,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 +303,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 +316,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..fe93b76dee 100644
--- a/src/gov/nasa/worldwind/WWObject.java
+++ b/src/gov/nasa/worldwind/WWObject.java
@@ -10,7 +10,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/WorldWind.java b/src/gov/nasa/worldwind/WorldWind.java
index b6e4f1919b..ecee9897fc 100644
--- a/src/gov/nasa/worldwind/WorldWind.java
+++ b/src/gov/nasa/worldwind/WorldWind.java
@@ -94,16 +94,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.
+ * 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 World Wind's current resource usage to its initial, empty state.
+ * 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 +169,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 +181,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
*/
diff --git a/src/gov/nasa/worldwind/WorldWindow.java b/src/gov/nasa/worldwind/WorldWindow.java
index 3273d40254..71c082c442 100644
--- a/src/gov/nasa/worldwind/WorldWindow.java
+++ b/src/gov/nasa/worldwind/WorldWindow.java
@@ -17,7 +17,7 @@
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 +94,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 +138,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 +166,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 +175,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 +184,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 +211,13 @@ public interface WorldWindow extends AVList
CollectionWorldWindowGLCanvas 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.
*
@@ -35,14 +35,14 @@
* 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
diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
index 6682737373..8d22ad6c92 100644
--- a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
+++ b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
@@ -20,7 +20,7 @@
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.
*
@@ -34,14 +34,14 @@
* 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
diff --git a/src/gov/nasa/worldwind/cache/AbstractFileStore.java b/src/gov/nasa/worldwind/cache/AbstractFileStore.java
index ce585e62c9..4243b9fc2f 100644
--- a/src/gov/nasa/worldwind/cache/AbstractFileStore.java
+++ b/src/gov/nasa/worldwind/cache/AbstractFileStore.java
@@ -612,7 +612,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..0334c012ed 100644
--- a/src/gov/nasa/worldwind/cache/BasicDataFileStore.java
+++ b/src/gov/nasa/worldwind/cache/BasicDataFileStore.java
@@ -53,13 +53,13 @@ public class BasicDataFileStore extends AbstractFileStore
* 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:
*
* gov.nasa.worldwind.avkey.CacheContentTypes.
*/
protected ListsearchLocalCache 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 +361,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 +369,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)
{
diff --git a/src/gov/nasa/worldwind/cache/FileStore.java b/src/gov/nasa/worldwind/cache/FileStore.java
index 98c5b3d8e8..030f471004 100644
--- a/src/gov/nasa/worldwind/cache/FileStore.java
+++ b/src/gov/nasa/worldwind/cache/FileStore.java
@@ -200,7 +200,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 +215,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/data/BasicDataRasterReaderFactory.java b/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java
index 3536f10a2a..13f7ca7e96 100644
--- a/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java
+++ b/src/gov/nasa/worldwind/data/BasicDataRasterReaderFactory.java
@@ -23,7 +23,7 @@
*
*
* 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/package.html b/src/gov/nasa/worldwind/data/package.html
index 504c27a794..066ef78283 100644
--- a/src/gov/nasa/worldwind/data/package.html
+++ b/src/gov/nasa/worldwind/data/package.html
@@ -15,10 +15,10 @@
- This package provides classes for converting raw data sources into a form which can be used by standard World Wind + 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 World Wind. This section + 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. @@ -51,21 +51,21 @@
{@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 + form which can be used by standard WorldWind components. There are three concrete implementations of DataStoreProducer:
- Data Configuration Documents are a common mechanism and file format for describing a World Wind + 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 @@ -74,7 +74,7 @@ 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. + 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. @@ -266,9 +266,9 @@
gdalalljni.dll is located in lib-external/gdal/win64/libgdalalljni.jnilib is in lib-external/gdal/macosx/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
+ 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.
- Example 1: Converting Georeferenced Imagery to the World Wind Tile Structure
+ Example 1: Converting Georeferenced Imagery to the WorldWind Tile Structure
- Example 2: Converting Georeferenced Elevation Data to the World Wind Tile Structure
+ Example 2: Converting Georeferenced Elevation Data to the WorldWind Tile Structure
- Example 3: Converting World Wind .NET LayerSets to the World Wind Java Tile Structure
+ Example 3: Converting WorldWind .NET LayerSets to the WorldWind Java Tile Structure
- Example 5: Reading Data Configuration Documents from the World Wind FileStore
+ Example 5: Reading Data Configuration Documents from the WorldWind FileStore
- Example 8: Searching for Data Configuration Documents in the World Wind FileStore
+ Example 8: Searching for Data Configuration Documents in the WorldWind FileStore
- Example 9: Creating World Wind Components from Data Configuration Documents
+ Example 9: Creating WorldWind Components from Data Configuration Documents
The data configuration files created in Example 1, Example 2, and
@@ -645,8 +645,8 @@ 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.
-
// 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.
+ // TiledImageProducer to create a pyramid of images tiles in the WorldWind Java cache format.
String imagePath = ...;
String tiledImagePath = ...;
String tiledImageDisplayName = ...;
@@ -330,7 +330,7 @@ Common Use Case Examples
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
+ // 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
@@ -338,7 +338,7 @@ Common Use Case Examples
// 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
+ // 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();
}
@@ -366,21 +366,21 @@ Common Use Case Examples
Converting georeferenced elevation data can be accomplished by referring to
- Example 1: Converting Georeferenced Imagery to the World Wind Tile Structure, and replacing
+ 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}.
- Converting World Wind .NET LayerSets can be accomplished by referring to
- Example 1: Converting Georeferenced Imagery to the World Wind Tile Structure, and replacing
+ 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}.
@@ -391,7 +391,7 @@ Common Use Case Examples
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 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.
// 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
+ // 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 = ...;
@@ -403,13 +403,13 @@ Common Use Case Examples
- // 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
+ // 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 = ...;
@@ -457,7 +457,7 @@ Common Use Case Examples
}
else
{
- // Otherwise, you'll need to create your own document. World Wind currently provides support for creating data
+ // 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.
@@ -479,7 +479,7 @@ Common Use Case Examples
// 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.
+ // files, DataDescriptor files, and WorldWind .NET LayerSet files.
String searchPath = ...;
String[] filePaths = WWIO.listDescendantFilenames(searchPath, new DataConfigurationFilter());
@@ -494,10 +494,10 @@ Common Use Case Examples
- There are two methods of searching for data configuration files in the World Wind FileStore. The first method
+ 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
@@ -505,11 +505,11 @@ Common Use Case Examples
the FileStore locations it searches for data configuration files.
- The second method searches the entire World Wind FileStore under a relative file store path. Use this method when
+ 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 World Wind FileStore location in which to look for data configuration files, return a list of cache names
+ // 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
- // World Wind .NET LayerSet files.
+ // WorldWind .NET LayerSet files.
String fileStoreLocation = ...;
String[] cacheNames = WWIO.listDescendantFilenames(fileStoreLocation, new DataConfigurationFilter(), false);
@@ -520,17 +520,17 @@
Common Use Case Examples
}
- // Given a search path in the World Wind FileStore to look for data configuration files, return a list of cache
+ // 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 World Wind .NET LayerSet files.
+ // DataDescriptor files, and WorldWind .NET LayerSet files.
FileStore fileStore = ...;
String fileStoreSearchPath = ...;
String[] cacheNames = fileStore.listTopFileNames(fileStoreSearchPath, new DataConfigurationFilter());
@@ -546,17 +546,17 @@ Common Use Case Examples
- // 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
+ // 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 World Wind file store.
+ 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.
@@ -583,7 +583,7 @@ Common Use Case Examples
}
else
{
- // Currently, World Wind supports factory construction of Layers and ElevationModels from data configuration
+ // 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;
@@ -606,10 +606,10 @@ DataDescriptor Porting Guide
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,
+ 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. World Wind needed a common mechanism to describe a component's configuration, but
+ 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
@@ -622,7 +622,7 @@
DataDescriptor Porting GuideBackward 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
+ 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.
@@ -632,8 +632,8 @@ DataDescriptor Porting GuideExample 4
DataDescriptor Porting GuideUpdating 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
+ 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.
@@ -726,15 +726,15 @@
DataDescriptor Porting Guide
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
+ DataDescriptor files in the WorldWind 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
+ // 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 = ...;
@@ -750,16 +750,16 @@ DataDescriptor Porting Guide
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
+ 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 World Wind
- // FileStore, create a World Wind Layer or ElevationModel according to the contents of the DataDescriptor.
+ // 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))
diff --git a/src/gov/nasa/worldwind/event/SelectEvent.java b/src/gov/nasa/worldwind/event/SelectEvent.java
index 27e2a1c7b6..099ab0ad33 100644
--- a/src/gov/nasa/worldwind/event/SelectEvent.java
+++ b/src/gov/nasa/worldwind/event/SelectEvent.java
@@ -19,13 +19,13 @@
* 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.
diff --git a/src/gov/nasa/worldwind/event/WWEvent.java b/src/gov/nasa/worldwind/event/WWEvent.java
index c83755f98c..3838d374f2 100644
--- a/src/gov/nasa/worldwind/event/WWEvent.java
+++ b/src/gov/nasa/worldwind/event/WWEvent.java
@@ -8,7 +8,7 @@
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
diff --git a/src/gov/nasa/worldwind/exception/WWTimeoutException.java b/src/gov/nasa/worldwind/exception/WWTimeoutException.java
index 81eae3a0e7..3040fea1a7 100644
--- a/src/gov/nasa/worldwind/exception/WWTimeoutException.java
+++ b/src/gov/nasa/worldwind/exception/WWTimeoutException.java
@@ -7,7 +7,7 @@
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/formats/gpx/GpxWriter.java b/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java
index c7fc5c2bb9..3cc79fe83e 100644
--- a/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java
+++ b/src/gov/nasa/worldwind/formats/gpx/GpxWriter.java
@@ -81,7 +81,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/shapefile/ShapefileLayerFactory.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java
index 88129c105b..a0d52db19c 100644
--- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java
+++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java
@@ -25,9 +25,9 @@
*
* Shapefile Geometry Conversion
*
- * Shapefile geometries are mapped to World Wind objects as follows:
+ * Shapefile geometries are mapped to WorldWind objects as follows:
*
- *
Shapefile Geometry World Wind Object Point {@link
+ *
Shapefile Geometry WorldWind Object Point {@link
* gov.nasa.worldwind.render.PointPlacemark} MultiPoint List of {@link
* gov.nasa.worldwind.render.PointPlacemark} Polyline {@link
* gov.nasa.worldwind.formats.shapefile.ShapefilePolylines} Polygon {@link
diff --git a/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java b/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java
index 9a59a32403..5c5d469ea9 100644
--- a/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java
+++ b/src/gov/nasa/worldwind/formats/tiff/GeotiffWriter.java
@@ -157,7 +157,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/vpf/GeoSymAttributeConverter.java b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java
index 39b7089c34..bd81c298e9 100644
--- a/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java
+++ b/src/gov/nasa/worldwind/formats/vpf/GeoSymAttributeConverter.java
@@ -15,12 +15,12 @@
/**
* 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 +425,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/layers/BasicLayerFactory.java b/src/gov/nasa/worldwind/layers/BasicLayerFactory.java
index e31e4db05b..1eda76fee9 100644
--- a/src/gov/nasa/worldwind/layers/BasicLayerFactory.java
+++ b/src/gov/nasa/worldwind/layers/BasicLayerFactory.java
@@ -38,7 +38,7 @@ public BasicLayerFactory()
* 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:
*
* @param configSource the configuration source. See above for supported types.
diff --git a/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java b/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java
index ff31d084a1..ad60dcb323 100644
--- a/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java
+++ b/src/gov/nasa/worldwind/layers/BasicTiledImageLayer.java
@@ -400,7 +400,7 @@ 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}.
@@ -435,7 +435,7 @@ public BulkRetrievalThread makeLocal(Sector sector, double resolution, BulkRetri
*
* @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,7 +460,7 @@ 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
@@ -487,7 +487,7 @@ public long getEstimatedMissingDataSize(Sector sector, double resolution)
*
* @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 +716,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..c5c30c05cf 100644
--- a/src/gov/nasa/worldwind/layers/BasicTiledImageLayerBulkDownloader.java
+++ b/src/gov/nasa/worldwind/layers/BasicTiledImageLayerBulkDownloader.java
@@ -20,7 +20,7 @@
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.
@@ -38,7 +38,7 @@ public class BasicTiledImageLayerBulkDownloader extends BulkRetrievalThread
protected ArrayList