Removed webstart build, fixed javadoc

Author: markpet42

release-build.xml

@@ -28,7 +28,7 @@
         <delete file="${basedir}/worldwindx.jar"/>
     </target>
 
-    <target name="assemble" depends="assembleDebug, assembleRelease, assembleJavadoc, assembleWebStart, assembleSdkArchive"
+    <target name="assemble" depends="assembleDebug, assembleRelease, assembleJavadoc, assembleSdkArchive"
             description="Assembles JAR libraries for all build types and assembles the project documentation."/>
 
     <!-- Targets for compiling Java sources and bundling JAR libraries. -->
@@ -115,177 +115,6 @@
         </zip>
     </target>
 
-    <!-- Tasks for assembling the project Web Start package. -->
-
-    <target name="assembleWebStart"
-            depends="assembleRelease, compileWebStartConfiguration, bundleWebStartLibraries, signWebStartSources, bundleWebStart"
-            description="Assembles the Java Web Start deployment package."/>
-
-    <target name="compileWebStartConfiguration">
-        <mkdir dir="${webstart.jnlp.dir}"/>
-        <copy todir="${webstart.jnlp.dir}">
-            <fileset dir="${webstart.src.dir}">
-                <include name="*.jnlp"/>
-                <exclude name="JavaWebStartTemplate.jnlp"/>
-                <type type="file"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="bundleWebStartLibraries">
-        <mkdir dir="${webstart.unsigned.dir}"/>
-        <!-- WorldWind library JAR files. -->
-        <copy file="${worldwind.jar.dir}/release/worldwind.jar" tofile="${webstart.unsigned.dir}/worldwind.jar"/>
-        <copy file="${worldwind.jar.dir}/release/worldwindx.jar" tofile="${webstart.unsigned.dir}/worldwindx.jar"/>
-        <!-- JOGL and GlueGen library JAR files. -->
-        <copy todir="${webstart.unsigned.dir}">
-            <fileset dir="${basedir}">
-                <include name="jogl-all*.jar"/>
-                <include name="gluegen-rt*.jar"/>
-                <type type="file"/>
-            </fileset>
-        </copy>
-        <!-- WebView native library JAR files. -->
-        <jar jarfile="${webstart.unsigned.dir}/webview-natives-macosx.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}">
-                <include name="libwebview.jnilib"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <jar jarfile="${webstart.unsigned.dir}/webview-natives-windows.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}">
-                <include name="WebView32.dll"/>
-                <include name="WebView64.dll"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <!-- GDAL library JAR files. -->
-        <copy file="${basedir}/gdal.jar" todir="${webstart.unsigned.dir}"/>
-        <jar jarfile="${webstart.unsigned.dir}/gdaldata.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}/lib-external/gdal/data">
-                <include name="**"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <!-- GDAL native library JAR files. -->
-        <jar jarfile="${webstart.unsigned.dir}/gdal-natives-macosx-universal.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}/lib-external/gdal">
-                <include name="GDAL_License.txt"/>
-                <include name="LizardTech_DSDK_License.txt"/>
-                <include name="LizardTech_3rd_Party.txt"/>
-                <include name="LizardTech_Redistributable.txt"/>
-                <include name="libgdalalljni.jnilib"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <jar jarfile="${webstart.unsigned.dir}/gdal-natives-windows-i586.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}/lib-external/gdal">
-                <include name="GDAL_License.txt"/>
-                <include name="LizardTech_DSDK_License.txt"/>
-                <include name="LizardTech_3rd_Party.txt"/>
-                <include name="LizardTech_Redistributable.txt"/>
-                <include name="gdalminjni32.dll"/>
-                <include name="gdalalljni32.dll"/>
-                <include name="gdalalljni32.dll.manifest"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <jar jarfile="${webstart.unsigned.dir}/gdal-natives-windows-amd64.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}/lib-external/gdal">
-                <include name="GDAL_License.txt"/>
-                <include name="LizardTech_DSDK_License.txt"/>
-                <include name="LizardTech_3rd_Party.txt"/>
-                <include name="LizardTech_Redistributable.txt"/>
-                <include name="gdalminjni64.dll"/>
-                <include name="gdalalljni64.dll"/>
-                <include name="gdalalljni64.dll.manifest"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <jar jarfile="${webstart.unsigned.dir}/gdal-natives-linux-i586.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}/lib-external/gdal">
-                <include name="GDAL_License.txt"/>
-                <include name="LizardTech_DSDK_License.txt"/>
-                <include name="LizardTech_3rd_Party.txt"/>
-                <include name="LizardTech_Redistributable.txt"/>
-                <include name="libgdalalljni32.so"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-        <jar jarfile="${webstart.unsigned.dir}/gdal-natives-linux-amd64.jar">
-            <manifest>
-                <attribute name="Permissions" value="all-permissions"/>
-            </manifest>
-            <fileset dir="${basedir}/lib-external/gdal">
-                <include name="GDAL_License.txt"/>
-                <include name="LizardTech_DSDK_License.txt"/>
-                <include name="LizardTech_3rd_Party.txt"/>
-                <include name="LizardTech_Redistributable.txt"/>
-                <include name="libgdalalljni64.so"/>
-                <type type="file"/>
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="signWebStartSources" depends="keystoreAvailable" if="keystore.isAvailable">
-        <property file="${basedir}/keystore.properties"/>
-        <copy todir="${webstart.jar.dir}">
-            <fileset dir="${webstart.unsigned.dir}">
-                <include name="*.jar"/>
-                <type type="file"/>
-            </fileset>
-        </copy>
-        <signjar alias="${keyAlias}" keystore="${storeFile}" storepass="${storePassword}" tsaurl="${tsaurl}">
-            <path>
-                <fileset dir="${webstart.jar.dir}">
-                    <include name="*.jar"/>
-                    <type type="file"/>
-                </fileset>
-            </path>
-        </signjar>
-    </target>
-
-    <target name="bundleWebStart" depends="bundleWebStartSigned, bundleWebStartUnsigned"/>
-
-    <target name="bundleWebStartSigned" if="keystore.isAvailable">
-        <zip destfile="${webstart.out.dir}/worldwind-webstart.zip">
-            <fileset dir="${webstart.jar.dir}"/>
-            <fileset dir="${webstart.jnlp.dir}"/>
-        </zip>
-    </target>
-
-    <target name="bundleWebStartUnsigned">
-        <zip destfile="${webstart.out.dir}/worldwind-webstart-unsigned.zip">
-            <fileset dir="${webstart.unsigned.dir}"/>
-            <fileset dir="${webstart.jnlp.dir}"/>
-        </zip>
-    </target>
-
-    <target name="keystoreAvailable">
-        <available property="keystore.isAvailable" file="${basedir}/keystore.properties"/>
-    </target>
-
     <!-- Targets for assembling the project SDK archive. -->
 
     <target name="assembleSdkArchive" depends="assembleRelease">

src/gov/nasa/worldwind/AbstractSceneController.java

@@ -1073,7 +1073,7 @@ protected void drawOrderedSurfaceRenderables(DrawContext dc)
      * gov.nasa.worldwind.render.SurfaceObject#render(gov.nasa.worldwind.render.DrawContext)} in ordered rendering mode.
      * This does nothing if the ordered surface renderable queue is empty, or if it does not contain any
      * SurfaceObjects.
-     * <p/>
+     * <p>
      * This method is called during the preRender phase, and is therefore free to modify the framebuffer contents to
      * create the composite representation.
      *

src/gov/nasa/worldwind/BasicFactory.java

@@ -94,7 +94,7 @@ public static Object create(String factoryKey, Object configSource, AVList param
      * <li>{@link gov.nasa.worldwind.ogc.wcs.wcs100.WCS100Capabilities}</li>
      * <li>{@link String} holding a file name, a name of a resource on the classpath, or a string representation of a
      * URL</li></ul>
-     * <p/>
+     * <p>
      *
      * @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

src/gov/nasa/worldwind/BasicModel.java

@@ -245,7 +245,7 @@ public Extent getExtent()
 
     /**
      * {@inheritDoc}
-     * <p/>
+     * <p>
      * This implementation forwards the message each layer in the model.
      *
      * @param msg The message that was received.

src/gov/nasa/worldwind/Configuration.java

@@ -22,35 +22,35 @@
  * 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.
- * <p/>
+ * <p>
  * 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.
- * <p/>
+ * <p>
  * When the Configuration class is first instantiated it reads the XML document <code>config/worldwind.xml</code> and
  * registers all the information there. The information can subsequently be retrieved via the class' various
  * <code>getValue</code> 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.
- * <p/>
+ * <p>
  * The default WorldWind configuration document is <code>config/worldwind.xml</code>. This can be changed by setting
  * the Java property <code>gov.nasa.worldwind.config.file</code> to a different file name or a valid URL prior to
  * 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 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.)
- * <p/>
+ * <p>
  * Additionally, an application may set another Java property, <code>gov.nasa.worldwind.app.config.document</code>, to a
  * file name or URL whose contents contain configuration values to override those of the primary configuration document.
  * 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.
- * <p/>
+ * <p>
  * See <code>config/worldwind.xml</code> for documentation on setting configuration values.
- * <p/>
+ * <p>
  * 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.
- * <p/>
+ * <p>
  * <em>Note:</em> Prior to September of 2009, configuration properties were read from the file
  * <code>config/worldwind.properties</code>. An alternate file could be specified via the
  * <code>gov.nasa.worldwind.config.file</code> Java property. These mechanisms remain available but are deprecated.
@@ -381,7 +381,7 @@ public static synchronized Double getDoubleValue(String key)
 
     /**
      * Return as a Boolean the value associated with a specified key.
-     * <p/>
+     * <p>
      * 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 +399,7 @@ public static synchronized Boolean getBooleanValue(String key, Boolean defaultVa
 
     /**
      * Return as a Boolean the value associated with a specified key.
-     * <p/>
+     * <p>
      * 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,7 +502,7 @@ 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:
-     * <p/>
+     * <p>
      * <table> <tr><th>Operating System</th><th>Path</th></tr> <tr><td>Mac OS X</td><td>~/Library/Application
      * Support</td></tr> <tr><td>Windows</td><td>~\\Application Data</td></tr> <tr><td>Linux, Unix,
      * Solaris</td><td>~/</td></tr> </table>
@@ -647,7 +647,7 @@ public static float getJavaVersion()
      * 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:
-     * <p/>
+     * <p>
      * <ul> <li>OpenGL compatibility profile 4.x</li> <li>OpenGL compatibility profile 3.x</li> <li>OpenGL profile 1.x
      * up to 3.0</li> </ul>
      *

src/gov/nasa/worldwind/Exportable.java

@@ -12,13 +12,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.
- * <p/>
+ * <p>
  * Example of use:
- * <p/>
  * <pre>
  * // Export a PointPlacemark in KML format
  * PointPlacemark placemark;
- * <p/>
  * StringWriter kml = new StringWriter();
  * placemark.export(KMLConstants.KML_MIME_TYPE, kml);
  * </pre>

src/gov/nasa/worldwind/SceneController.java

@@ -109,7 +109,7 @@ public interface SceneController extends WWObject, Disposable
      * Specifies the current pick point in AWT screen coordinates, or <code>null</code> 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()}.
-     * <p/>
+     * <p>
      * If the pick point is <code>null</code>, this scene controller ignores the pick point and the list of objects
      * returned by getPickedObjectList is empty.
      *
@@ -130,7 +130,7 @@ public interface SceneController extends WWObject, Disposable
      * Specifies the current pick rectangle in AWT screen coordinates, or <code>null</code> 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()}.
-     * <p/>
+     * <p>
      * If the pick rectangle is <code>null</code>, this scene controller ignores the pick rectangle and the list of
      * objects returned by getObjectsInPickRectangle is empty.
      *

src/gov/nasa/worldwind/StereoOptionSceneController.java

@@ -15,18 +15,17 @@
 /**
  * TODO: This file needs to be updated to implement "correct" stereo, as described at:
  * http://www.orthostereo.com/geometryopengl.html
- * <p/>
- * <p/>
+ * <p>
  * 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 <code>gov.nasa.worldwind.stereo.mode</code> 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.
- * <p/>
+ * <p>
  * The {@link WorldWindow} instance must support stereo in order to use device-supported stereo. A stereo
  * <code>WorldWindow</code> is selected by specifying the Java VM property described above prior to creating it. See
  * {@link gov.nasa.worldwind.awt.WorldWindowGLCanvas} for further details.
- * <p/>
+ * <p>
  * Note: The logic and much of the code here was contributed by Xander Enzmann of Mitre Corporation.
  *
  * @author tag
@@ -114,7 +113,7 @@ public boolean isHardwareStereo()
 
     /**
      * {@inheritDoc}
-     * <p/>
+     * <p>
      * If the display device is providing stereo -- {@link #isHardwareStereo()} is <code>true</code> -- 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 +157,7 @@ else if (AVKey.STEREO_MODE_RED_BLUE.equals(this.stereoMode) && pitchInRange)
 
     /**
      * Implement no stereo ("Mono") while using a stereo device.
-     * <p/>
+     * <p>
      * 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.
      *

src/gov/nasa/worldwind/StereoSceneController.java

@@ -10,7 +10,7 @@
 
 /**
  * An interface for scene controllers that provide stereo.
- * <p/>
+ * <p>
  * 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 +24,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.
-     * <p/>
+     * <p>
      * If <code>STEREO_MODE_DEVICE</code> is requested but the display device does not support stereo, stereo is not
      * applied.
-     * <p/>
+     * <p>
      * 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