Skip to content

Commit 9039b48

Browse files
authored
Merge pull request #24 from emxsys/fix/javadoc
Fixed JavaDoc errors and warnings
2 parents 7c9a3ae + 64aa0ef commit 9039b48

370 files changed

Lines changed: 2867 additions & 2341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<javadoc destdir="${worldwind.doc.dir}/javadoc"
8888
overview="${worldwind.src.dir}/overview.html"
8989
encoding="UTF-8"
90-
windowtitle="NASA WorldWind" doctitle="NASA WorldWind" header="NASA WorldWind"
90+
windowtitle="WorldWindJava API" doctitle="NASA WorldWind Java-Community Edition" header="NASA WorldWind-CE"
9191
splitindex="true" protected="true" nodeprecated="true" version="false" author="false" use="true"
9292
maxmemory="1024m">
9393
<packageset dir="${worldwind.src.dir}" defaultexcludes="yes">

src/gov/nasa/worldwind/AbstractSceneController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ protected void drawOrderedSurfaceRenderables(DrawContext dc)
10731073
* gov.nasa.worldwind.render.SurfaceObject#render(gov.nasa.worldwind.render.DrawContext)} in ordered rendering mode.
10741074
* This does nothing if the ordered surface renderable queue is empty, or if it does not contain any
10751075
* SurfaceObjects.
1076-
* <p/>
1076+
* <p>
10771077
* This method is called during the preRender phase, and is therefore free to modify the framebuffer contents to
10781078
* create the composite representation.
10791079
*

src/gov/nasa/worldwind/BasicFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static Object create(String factoryKey, Object configSource, AVList param
9494
* <li>{@link gov.nasa.worldwind.ogc.wcs.wcs100.WCS100Capabilities}</li>
9595
* <li>{@link String} holding a file name, a name of a resource on the classpath, or a string representation of a
9696
* URL</li></ul>
97-
* <p/>
97+
* <p>
9898
*
9999
* @param configSource the configuration source. See above for supported types.
100100
* @param params key-value parameters to override or supplement the information provided in the specified

src/gov/nasa/worldwind/BasicModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public Extent getExtent()
244244

245245
/**
246246
* {@inheritDoc}
247-
* <p/>
247+
* <p>
248248
* This implementation forwards the message each layer in the model.
249249
*
250250
* @param msg The message that was received.

src/gov/nasa/worldwind/Configuration.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,35 @@
2222
* contents. Configurations files contain the names of classes to create at run-time, the initial model definition,
2323
* including the globe, elevation model and layers, and various control quantities such as cache sizes and data
2424
* retrieval timeouts.
25-
* <p/>
25+
* <p>
2626
* The Configuration class is a singleton, but its instance is not exposed publicly. It is addressed only via static
2727
* methods of the class. It is constructed upon first use of any of its static methods.
28-
* <p/>
28+
* <p>
2929
* When the Configuration class is first instantiated it reads the XML document <code>config/worldwind.xml</code> and
3030
* registers all the information there. The information can subsequently be retrieved via the class' various
3131
* <code>getValue</code> methods. Many WorldWind start-up objects query this information to determine the classes to
3232
* create. For example, the first WorldWind object created by an application is typically a {@link
3333
* gov.nasa.worldwind.awt.WorldWindowGLCanvas}. During construction that class causes WorldWind's internal classes to
3434
* be constructed, using the names of those classes drawn from the Configuration singleton, this class.
35-
* <p/>
35+
* <p>
3636
* The default WorldWind configuration document is <code>config/worldwind.xml</code>. This can be changed by setting
3737
* the Java property <code>gov.nasa.worldwind.config.file</code> to a different file name or a valid URL prior to
3838
* creating any WorldWind object or invoking any static methods of WorldWind classes, including the Configuration
3939
* class. When an application specifies a different configuration location it typically does so in its main method prior
4040
* to using WorldWind. If a file is specified its location must be on the classpath. (The contents of application and
4141
* WorldWind jar files are typically on the classpath, in which case the configuration file may be in the jar file.)
42-
* <p/>
42+
* <p>
4343
* Additionally, an application may set another Java property, <code>gov.nasa.worldwind.app.config.document</code>, to a
4444
* file name or URL whose contents contain configuration values to override those of the primary configuration document.
4545
* WorldWind overrides only those values in this application document, it leaves all others to the value specified in
4646
* the primary document. Applications usually specify an override document in order to specify the initial layers in the
4747
* model.
48-
* <p/>
48+
* <p>
4949
* See <code>config/worldwind.xml</code> for documentation on setting configuration values.
50-
* <p/>
50+
* <p>
5151
* Configuration values can also be set programatically via {@link Configuration#setValue(String, Object)}, but they are
5252
* not retroactive so affect only Configuration queries made subsequent to setting the value.
53-
* <p/>
53+
* <p>
5454
* <em>Note:</em> Prior to September of 2009, configuration properties were read from the file
5555
* <code>config/worldwind.properties</code>. An alternate file could be specified via the
5656
* <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)
381381

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

400400
/**
401401
* Return as a Boolean the value associated with a specified key.
402-
* <p/>
402+
* <p>
403403
* Valid values for true are '1' or anything that starts with 't' or 'T'. ie. 'true', 'True', 't' Valid values for
404404
* false are '0' or anything that starts with 'f' or 'F'. ie. 'false', 'False', 'f'
405405
*
@@ -502,10 +502,12 @@ public static String getSystemTempDirectory()
502502
* Returns the path to the current user's application data directory. The path returned depends on the operating
503503
* system on which the Java Virtual Machine is running. The following table provides the path for all supported
504504
* operating systems:
505-
* <p/>
506-
* <table> <tr><th>Operating System</th><th>Path</th></tr> <tr><td>Mac OS X</td><td>~/Library/Application
507-
* Support</td></tr> <tr><td>Windows</td><td>~\\Application Data</td></tr> <tr><td>Linux, Unix,
508-
* Solaris</td><td>~/</td></tr> </table>
505+
* <table><caption>Returned Paths</caption>
506+
* <tr><th>Operating System</th><th>Path</th></tr>
507+
* <tr><td>Mac OS X</td><td>~/Library/Application Support</td></tr>
508+
* <tr><td>Windows</td><td>~\\Application Data</td></tr>
509+
* <tr><td>Linux, Unix, Solaris</td><td>~/</td></tr>
510+
* </table>
509511
*
510512
* @return the absolute path to the current user's application data directory.
511513
*/
@@ -647,9 +649,11 @@ public static float getJavaVersion()
647649
* Returns the highest OpenGL profile available on the current graphics device that is compatible with WorldWind.
648650
* The returned profile favors hardware acceleration over software acceleration. With JOGL version 2.0, this returns
649651
* the highest available profile from the following list:
650-
* <p/>
651-
* <ul> <li>OpenGL compatibility profile 4.x</li> <li>OpenGL compatibility profile 3.x</li> <li>OpenGL profile 1.x
652-
* up to 3.0</li> </ul>
652+
* <ul>
653+
* <li>OpenGL compatibility profile 4.x</li>
654+
* <li>OpenGL compatibility profile 3.x</li>
655+
* <li>OpenGL profile 1.x up to 3.0</li>
656+
* </ul>
653657
*
654658
* @return the highest compatible OpenGL profile.
655659
*/

src/gov/nasa/worldwind/Exportable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
* Exportable marks an object that can be exported in different data formats. Implementing classes may support one or
1313
* more export formats. Formats are identified by MIME type. Call {@link #isExportFormatSupported(String)} to determine
1414
* if an object supports export in a certain format.
15-
* <p/>
15+
* <p>
1616
* Example of use:
17-
* <p/>
17+
*
1818
* <pre>
1919
* // Export a PointPlacemark in KML format
2020
* PointPlacemark placemark;
21-
* <p/>
21+
*
2222
* StringWriter kml = new StringWriter();
2323
* placemark.export(KMLConstants.KML_MIME_TYPE, kml);
2424
* </pre>

src/gov/nasa/worldwind/SceneController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public interface SceneController extends WWObject, Disposable
109109
* Specifies the current pick point in AWT screen coordinates, or <code>null</code> to indicate that there is no
110110
* pick point. Each frame, this scene controller determines which objects are drawn at the pick point and places
111111
* them in a PickedObjectList. This list can be accessed by calling {@link #getPickedObjectList()}.
112-
* <p/>
112+
* <p>
113113
* If the pick point is <code>null</code>, this scene controller ignores the pick point and the list of objects
114114
* returned by getPickedObjectList is empty.
115115
*
@@ -130,7 +130,7 @@ public interface SceneController extends WWObject, Disposable
130130
* Specifies the current pick rectangle in AWT screen coordinates, or <code>null</code> to indicate that there is no
131131
* pick rectangle. Each frame, this scene controller determines which objects intersect the pick rectangle and
132132
* places them in a PickedObjectList. This list can be accessed by calling {@link #getObjectsInPickRectangle()}.
133-
* <p/>
133+
* <p>
134134
* If the pick rectangle is <code>null</code>, this scene controller ignores the pick rectangle and the list of
135135
* objects returned by getObjectsInPickRectangle is empty.
136136
*

src/gov/nasa/worldwind/StereoOptionSceneController.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
/**
1616
* TODO: This file needs to be updated to implement "correct" stereo, as described at:
1717
* http://www.orthostereo.com/geometryopengl.html
18-
* <p/>
19-
* <p/>
18+
* <p>
2019
* This scene controller draws in stereo, either red-blue anaglyph or device supported if the display device provides
2120
* stereo directly. It can also draw without applying stereo. To select stereo, prior to calling this class' constructor
2221
* set the Java VM property <code>gov.nasa.worldwind.stereo.mode</code> to "device" for device supported stereo (if
2322
* provided by the device) or "redblue" for red-blue anaglyph stereo. If the property is not set or is any other value,
2423
* this class does not draw in stereo.
25-
* <p/>
24+
* <p>
2625
* The {@link WorldWindow} instance must support stereo in order to use device-supported stereo. A stereo
2726
* <code>WorldWindow</code> is selected by specifying the Java VM property described above prior to creating it. See
2827
* {@link gov.nasa.worldwind.awt.WorldWindowGLCanvas} for further details.
29-
* <p/>
28+
* <p>
3029
* Note: The logic and much of the code here was contributed by Xander Enzmann of Mitre Corporation.
3130
*
3231
* @author tag
@@ -114,7 +113,7 @@ public boolean isHardwareStereo()
114113

115114
/**
116115
* {@inheritDoc}
117-
* <p/>
116+
* <p>
118117
* If the display device is providing stereo -- {@link #isHardwareStereo()} is <code>true</code> -- this method
119118
* returns true even if the stereo mode is {@link AVKey#STEREO_MODE_NONE}. In this case, individual stereo images
120119
* 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)
158157

159158
/**
160159
* Implement no stereo ("Mono") while using a stereo device.
161-
* <p/>
160+
* <p>
162161
* Note that this method draws the image twice, once to each of the left and right eye buffers, even when stereo is
163162
* not in effect. This is to prevent the stereo device from drawing blurred scenes.
164163
*

src/gov/nasa/worldwind/StereoSceneController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/**
1212
* An interface for scene controllers that provide stereo.
13-
* <p/>
13+
* <p>
1414
* Note: The {@link WorldWindow} instance must support stereo display in order to use device-supported stereo. See
1515
* {@link gov.nasa.worldwind.awt.WorldWindowGLCanvas} to learn how to select a stereo device.
1616
*
@@ -24,10 +24,10 @@ public interface StereoSceneController extends SceneController
2424
* gov.nasa.worldwind.avlist.AVKey#STEREO_MODE_DEVICE} to request device supported stereo, {@link
2525
* gov.nasa.worldwind.avlist.AVKey#STEREO_MODE_RED_BLUE} to request red-blue anaglyph stereo implemented in
2626
* software, or {@link gov.nasa.worldwind.avlist.AVKey#STEREO_MODE_NONE} (the default) to request no stereo effect.
27-
* <p/>
27+
* <p>
2828
* If <code>STEREO_MODE_DEVICE</code> is requested but the display device does not support stereo, stereo is not
2929
* applied.
30-
* <p/>
30+
* <p>
3131
* See the implementing class to determine how it detects the initial stereo mode.
3232
*
3333
* @param mode the technique used to provide the stereo effect. If null, the mode is set to {@link

src/gov/nasa/worldwind/View.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@
1818
* follows the OpenGL convention of a right-handed coordinate system with the origin at the eye point and looking down
1919
* the negative Z axis. <code>View</code> also provides a transformation from eye coordinates to screen coordinates,
2020
* following the OpenGL convention of an origin in the lower left hand screen corner.
21-
* <p/>
21+
* <p>
2222
* Most of the accessor and computation methods on <code>View</code> will use viewing state computed in the last call to
2323
* {@link #apply(gov.nasa.worldwind.render.DrawContext) apply}.
24-
* <p/>
25-
* The following methods return state values <i>updated in the most recent call to apply</i>. <code> <ul>
26-
* <li>getEyePosition</li> <li>getEyePoint</li> <li>getUpVector</li> <li>getForwardVector</li>
27-
* <li>getModelviewMatrix</li> <li>getViewport</li> <li>getFrustum</li> <li>getFrustumInModelCoordinates</li>
28-
* <li>getProjectionMatrix</li> </code> </ul>
29-
* <p/>
24+
* <p>
25+
* The following methods return state values <i>updated in the most recent call to apply</i>.<ul>
26+
* <li><code>getEyePosition</code></li> <li><code>getEyePoint</code></li>
27+
* <li><code>getUpVector</code></li> <li><code>getForwardVector</code></li>
28+
* <li><code>getModelviewMatrix</code></li> <li><code>getViewport</code></li>
29+
* <li><code>getFrustum</code></li> <li><code>getFrustumInModelCoordinates</code></li>
30+
* <li><code>getProjectionMatrix</code></li> </ul>
31+
* <p>
3032
* The following methods return computed values using state that was updated in the most recent call to
31-
* <code>apply</code>. <code> <ul> <li>project</li> <li>unproject</li> <li>computeRayFromScreenPoint</li>
33+
* <code>apply</code>. <ul>
34+
* <li>project</li> <li>unproject</li> <li>computeRayFromScreenPoint</li>
3235
* <li>computePositionFromScreenPoint</li> <li>computePixelSizeAtDistance</li> <li>computeHorizonDistance</li> </ul>
33-
* </code>
3436
*
3537
* @author Paul Collins
3638
* @version $Id: View.java 1171 2013-02-11 21:45:02Z dcollins $
@@ -47,7 +49,7 @@ public interface View extends WWObject, Restorable
4749
/**
4850
* Returns the current geographic coordinates of this view's eye position, as computed for the most recent model
4951
* traversal.
50-
* <p/>
52+
* <p>
5153
* Note: The value returned is not necessarily the value specified to {@link #setEyePosition(gov.nasa.worldwind.geom.Position)}
5254
* but is the eye position corresponding to this view's most recently applied state.
5355
*
@@ -68,7 +70,7 @@ public interface View extends WWObject, Restorable
6870
/**
6971
* Returns the current geographic coordinates of this view's eye position, as determined from this view's current
7072
* parameters.
71-
* <p/>
73+
* <p>
7274
* Note: The value returned is not necessarily the value specified to {@link #setEyePosition(gov.nasa.worldwind.geom.Position)}
7375
* but is the eye position corresponding to this view's current parameters.
7476
*

0 commit comments

Comments
 (0)