Skip to content

Commit 444c2fc

Browse files
committed
Deprecation fixes
1 parent a4ec23f commit 444c2fc

38 files changed

+2805
-3473
lines changed

src/gov/nasa/worldwind/formats/georss/GeoRSSParser.java

Lines changed: 144 additions & 221 deletions
Large diffs are not rendered by default.

src/gov/nasa/worldwind/globes/FlatGlobe.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public GlobeStateKey getGlobeStateKey()
142142
*
143143
* @deprecated Use {@link #setProjection(GeographicProjection)}.
144144
*/
145+
@Deprecated
145146
public void setProjection(String projection)
146147
{
147148
if (projection == null)

src/gov/nasa/worldwind/layers/AirspaceLayer.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* @version $Id: AirspaceLayer.java 2231 2014-08-15 19:03:12Z dcollins $
2020
* @deprecated Use {@link RenderableLayer} instead.
2121
*/
22+
@Deprecated
2223
public class AirspaceLayer extends AbstractLayer
2324
{
2425
private final java.util.Collection<Airspace> airspaces = new java.util.concurrent.ConcurrentLinkedQueue<Airspace>();
@@ -40,6 +41,7 @@ public AirspaceLayer()
4041
* @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#addRenderable(gov.nasa.worldwind.render.Renderable)}
4142
* instead.
4243
*/
44+
@Deprecated
4345
public void addAirspace(Airspace airspace)
4446
{
4547
if (airspace == null)
@@ -69,6 +71,7 @@ public void addAirspace(Airspace airspace)
6971
* @throws IllegalStateException if a custom Iterable has been specified by a call to setRenderables.
7072
* @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#addRenderables(Iterable)} instead.
7173
*/
74+
@Deprecated
7275
public void addAirspaces(Iterable<Airspace> airspaces)
7376
{
7477
if (airspaces == null)
@@ -104,6 +107,7 @@ public void addAirspaces(Iterable<Airspace> airspaces)
104107
* @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#removeRenderable(gov.nasa.worldwind.render.Renderable)}
105108
* instead.
106109
*/
110+
@Deprecated
107111
public void removeAirspace(Airspace airspace)
108112
{
109113
if (airspace == null)
@@ -129,6 +133,7 @@ public void removeAirspace(Airspace airspace)
129133
* @throws IllegalStateException If a custom Iterable has been specified by a call to <code>setAirspaces</code>.
130134
* @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#removeAllRenderables()} instead.
131135
*/
136+
@Deprecated
132137
public void removeAllAirspaces()
133138
{
134139
if (this.airspacesOverride != null)
@@ -157,6 +162,7 @@ private void clearAirspaces()
157162
*
158163
* @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#getRenderables()} instead.
159164
*/
165+
@Deprecated
160166
public Iterable<Airspace> getAirspaces()
161167
{
162168
if (this.airspacesOverride != null)
@@ -204,6 +210,7 @@ private Iterable<Airspace> getActiveAirspaces()
204210
*
205211
* @deprecated Use {@link RenderableLayer} and {@link RenderableLayer#setRenderables(Iterable)} instead.
206212
*/
213+
@Deprecated
207214
public void setAirspaces(Iterable<Airspace> airspaceIterable)
208215
{
209216
this.airspacesOverride = airspaceIterable;
@@ -219,6 +226,7 @@ public void setAirspaces(Iterable<Airspace> airspaceIterable)
219226
* @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#isEnableAntialiasing()} on each Airspace
220227
* instance in the layer.
221228
*/
229+
@Deprecated
222230
public boolean isEnableAntialiasing()
223231
{
224232
return false; // deprecated method
@@ -232,6 +240,7 @@ public boolean isEnableAntialiasing()
232240
* @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#setEnableAntialiasing(boolean)} on each Airspace
233241
* instance in the layer.
234242
*/
243+
@Deprecated
235244
public void setEnableAntialiasing(boolean enable)
236245
{
237246
// deprecated method
@@ -245,6 +254,7 @@ public void setEnableAntialiasing(boolean enable)
245254
* @deprecated Control over airspace blending is no longer supported. Airspaces implicitly blend themselves with
246255
* other objects in the scene.
247256
*/
257+
@Deprecated
248258
public boolean isEnableBlending()
249259
{
250260
return false; // deprecated method
@@ -258,6 +268,7 @@ public boolean isEnableBlending()
258268
* @deprecated Control over airspace blending is no longer supported. Airspaces implicitly blend themselves with
259269
* other objects in the scene.
260270
*/
271+
@Deprecated
261272
public void setEnableBlending(boolean enable)
262273
{
263274
// deprecated method
@@ -271,6 +282,7 @@ public void setEnableBlending(boolean enable)
271282
* @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#isEnableDepthOffset()} on each Airspace
272283
* instance in the layer.
273284
*/
285+
@Deprecated
274286
public boolean isEnableDepthOffset()
275287
{
276288
return false; // deprecated method
@@ -284,6 +296,7 @@ public boolean isEnableDepthOffset()
284296
* @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)} on each
285297
* Airspace instance in the layer.
286298
*/
299+
@Deprecated
287300
public void setEnableDepthOffset(boolean enable)
288301
{
289302
// deprecated method
@@ -297,6 +310,7 @@ public void setEnableDepthOffset(boolean enable)
297310
* @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#isEnableLighting()} on each Airspace instance in
298311
* the layer.
299312
*/
313+
@Deprecated
300314
public boolean isEnableLighting()
301315
{
302316
return false; // deprecated method
@@ -310,6 +324,7 @@ public boolean isEnableLighting()
310324
* @deprecated Use {@link gov.nasa.worldwind.render.ShapeAttributes#isEnableLighting()} on each Airspace instance in
311325
* the layer.
312326
*/
327+
@Deprecated
313328
public void setEnableLighting(boolean enable)
314329
{
315330
// deprecated method
@@ -322,6 +337,7 @@ public void setEnableLighting(boolean enable)
322337
*
323338
* @deprecated Control over drawing Airspace extents is no longer supported.
324339
*/
340+
@Deprecated
325341
public boolean isDrawExtents()
326342
{
327343
return false; // deprecated method
@@ -334,6 +350,7 @@ public boolean isDrawExtents()
334350
*
335351
* @deprecated Control over drawing Airspace extents is no longer supported.
336352
*/
353+
@Deprecated
337354
public void setDrawExtents(boolean draw)
338355
{
339356
// deprecated method
@@ -346,6 +363,7 @@ public void setDrawExtents(boolean draw)
346363
*
347364
* @deprecated Control over drawing Airspace in wireframe mode is no longer supported.
348365
*/
366+
@Deprecated
349367
public boolean isDrawWireframe()
350368
{
351369
return false; // deprecated method
@@ -358,6 +376,7 @@ public boolean isDrawWireframe()
358376
*
359377
* @deprecated Control over drawing Airspace in wireframe mode is no longer supported.
360378
*/
379+
@Deprecated
361380
public void setDrawWireframe(boolean draw)
362381
{
363382
// deprecated method
@@ -371,6 +390,7 @@ public void setDrawWireframe(boolean draw)
371390
* @deprecated Control over Airspace depth offset is no longer supported. See {@link
372391
* gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}.
373392
*/
393+
@Deprecated
374394
public Double getDepthOffsetFactor()
375395
{
376396
return 0d; // deprecated method
@@ -384,6 +404,7 @@ public Double getDepthOffsetFactor()
384404
* @deprecated Control over Airspace depth factor is no longer supported. See {@link
385405
* gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}.
386406
*/
407+
@Deprecated
387408
public void setDepthOffsetFactor(Double factor)
388409
{
389410
// deprecated method
@@ -397,6 +418,7 @@ public void setDepthOffsetFactor(Double factor)
397418
* @deprecated Control over Airspace depth units is no longer supported. See {@link
398419
* gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}.
399420
*/
421+
@Deprecated
400422
public Double getDepthOffsetUnits()
401423
{
402424
return 0d; // deprecated method
@@ -410,6 +432,7 @@ public Double getDepthOffsetUnits()
410432
* @deprecated Control over Airspace depth units is no longer supported. See {@link
411433
* gov.nasa.worldwind.render.airspaces.Airspace#setEnableDepthOffset(boolean)}.
412434
*/
435+
@Deprecated
413436
public void setDepthOffsetUnits(Double units)
414437
{
415438
// deprecated method
@@ -423,6 +446,7 @@ public void setDepthOffsetUnits(Double units)
423446
* @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#isEnableBatchRendering()} on each Airspace
424447
* instance in the layer.
425448
*/
449+
@Deprecated
426450
public boolean isEnableBatchRendering()
427451
{
428452
return false; // deprecated method
@@ -436,6 +460,7 @@ public boolean isEnableBatchRendering()
436460
* @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#setEnableBatchRendering(boolean)} on each
437461
* Airspace instance in the layer.
438462
*/
463+
@Deprecated
439464
public void setEnableBatchRendering(boolean enableBatchRendering)
440465
{
441466
// deprecated method
@@ -449,6 +474,7 @@ public void setEnableBatchRendering(boolean enableBatchRendering)
449474
* @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#isEnableBatchPicking()} on each Airspace
450475
* instance in the layer.
451476
*/
477+
@Deprecated
452478
public boolean isEnableBatchPicking()
453479
{
454480
return false; // deprecated method
@@ -462,6 +488,7 @@ public boolean isEnableBatchPicking()
462488
* @deprecated Use {@link gov.nasa.worldwind.render.airspaces.Airspace#setEnableBatchPicking(boolean)} on each
463489
* Airspace instance in the layer.
464490
*/
491+
@Deprecated
465492
public void setEnableBatchPicking(boolean enableBatchPicking)
466493
{
467494
// deprecated method

0 commit comments

Comments
 (0)